ninharp/ninlight-w600
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

docs: irreführende Kommentare zu Flash-Locking und G95-Pinbelegung korrigieren

Browse Source 
nl_flash_w600.c: der Header-Kommentar behauptete, tls_spifls_*/tls_fls_* kämen ganz ohne Locking aus - tatsächlich ist nur das Pin-Switching für die >1MB-Region (ioclose/cs/ck-Switching in wm_internal_fls.c) unsynchronisiert, unser Mutex serialisiert ausschließlich ninlights eigene Tasks, nicht SDK-interne Flash-Nutzer wie den Parameter-Store oder fwup (für Plan 2 vorgemerkt). Auch der Kommentar auf nl_flash_region_base() war ungenau. nl_board.c: G95-Kommentar eindeutiger formuliert (aktuelle Tabelle CW=PB13/WW=PB15, alte Lampen ggf. PB16=WW/PB15=CW).
This commit is contained in:
Michael Sauer
2026-09-11 20:53:43 +02:00
parent 9ce5135489
commit d03b571bb8
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/board/nl_board.c
+2 -1
View File
@@ -27,7 +27,8 @@ const nl_board_t nl_boards[] = {
{NONE, NONE, NONE, CH(2, NL_PB(16)), CH(4, NL_PB(8))}, NO_SM}, {NONE, NONE, NONE, CH(2, NL_PB(16)), CH(4, NL_PB(8))}, NO_SM},
{"gu10_cw", "Klyqa GU10 CW/WW", NL_DRV_PWM, false, 2500, 5000, 600, {"gu10_cw", "Klyqa GU10 CW/WW", NL_DRV_PWM, false, 2500, 5000, 600,
{NONE, NONE, NONE, CH(2, NL_PB(16)), CH(4, NL_PB(8))}, NO_SM}, {NONE, NONE, NONE, CH(2, NL_PB(16)), CH(4, NL_PB(8))}, NO_SM},
/* G95: pin assignment still to be verified on a series bulb (old note: PB16=WW, PB15=CW). */ /* G95: current table: CW=PB13, WW=PB15 (new assignment); old bulbs may use
* PB16=WW, PB15=CW - verify on a series bulb. */
{"g95_cw", "Klyqa G95 Vintage CW/WW", NL_DRV_PWM, false, 2500, 5000, 600, {"g95_cw", "Klyqa G95 Vintage CW/WW", NL_DRV_PWM, false, 2500, 5000, 600,
{NONE, NONE, NONE, CH(1, NL_PB(13)), CH(3, NL_PB(15))}, NO_SM}, {NONE, NONE, NONE, CH(1, NL_PB(13)), CH(3, NL_PB(15))}, NO_SM},
}; };
src/config/nl_flash_w600.c
+15 -5
View File
@@ -5,12 +5,19 @@
#include "config/nl_flash.h" #include "config/nl_flash.h"
/* /*
* The ninlight flash region lies above FLASH_1M_END_ADDR, where the SDK routes * The ninlight flash region lies above FLASH_1M_END_ADDR, where the SDK's
* tls_fls_read/write/erase to the external SPI flash path without taking its own * tls_fls_read/write/erase switch the flash pins (CS/CK/DI/DO ioclose/open, see the
* fls_lock (see sdk/Platform/Drivers/internalflash/wm_internal_fls.c). The app task * tls_spifls_*_switch() calls around the >1 MB branch in
* sdk/Platform/Drivers/internalflash/wm_internal_fls.c) to reach the external SPI
* flash - and that pin switching is not serialised by the SDK itself. The app task
* (periodic nl_state_log_append) and the console task (nl_app_save_settings, * (periodic nl_state_log_append) and the console task (nl_app_save_settings,
* nl_app_factory_reset) can therefore issue concurrent SPI transactions and corrupt * nl_app_factory_reset) can therefore issue concurrent SPI transactions and corrupt
* each other. Serialise all flash accesses with our own mutex. * each other. Serialise all of *ninlight's own* flash accesses with our own mutex.
*
* This mutex only covers ninlight's own tasks. Other SDK-internal users of the
* tls_fls_* / tls_spifls_* functions in the same >1 MB region (e.g. the params
* store, fwup) are not serialised against us or each other by this lock - tracked
* for plan 2.
* *
* The mutex is created once in nl_flash_init(), called as the very first statement * The mutex is created once in nl_flash_init(), called as the very first statement
* of app_task() before any other task can touch flash - not lazily from inside a * of app_task() before any other task can touch flash - not lazily from inside a
@@ -70,6 +77,9 @@ int nl_flash_erase_sector(uint32_t addr)
uint32_t nl_flash_region_base(void) uint32_t nl_flash_region_base(void)
{ {
/* The first user sector is TLS_FLASH_PARAM_DEFAULT (SDK), ninlight starts one sector later. */ /* TLS_FLASH_PARAM_DEFAULT is set by the SDK to the same address as USER_ADDR_START
* (see sdk/Platform/Common/fwup/wm_fwup.c) - i.e. the first user sector doubles as
* the SDK's own parameter-store sector. ninlight must not touch that sector, so its
* region starts one sector after USER_ADDR_START. */
return USER_ADDR_START + NL_FLASH_SECTOR_SIZE; return USER_ADDR_START + NL_FLASH_SECTOR_SIZE;
} }