Clean up stm32l0_system.c to have proper system events; stm32l0_sfspi.c rework, so that the SFLASH actually goes to DeepPowerDown mode

Author: GrumpyOldPizza

system/STM32L0xx/Include/stm32l0_system.h

@@ -85,9 +85,6 @@ enum {
 #define STM32L0_SYSTEM_LOCK_RUN                0
 #define STM32L0_SYSTEM_LOCK_SLEEP              1
 #define STM32L0_SYSTEM_LOCK_DEEPSLEEP          2
-  //#define STM32L0_SYSTEM_LOCK_CLOCKS             0  // ###
-//#define STM32L0_SYSTEM_LOCK_STOP               2  // ###
-//#define STM32L0_SYSTEM_LOCK_STANDBY            3  // ###
 #define STM32L0_SYSTEM_LOCK_RANGE_2_3          3
 #define STM32L0_SYSTEM_LOCK_RANGE_3            4
 #define STM32L0_SYSTEM_LOCK_REGULATOR          5
@@ -105,6 +102,7 @@ enum {
 #define STM32L0_SYSTEM_EVENT_STOP_LEAVE        0x00000008
 #define STM32L0_SYSTEM_EVENT_STANDBY           0x00000010
 #define STM32L0_SYSTEM_EVENT_RESET             0x00000020
+#define STM32L0_SYSTEM_EVENT_DFU               0x00000040
 
 typedef void (*stm32l0_system_callback_t)(void *context, uint32_t events);
 
@@ -117,12 +115,14 @@ typedef struct _stm32l0_system_notify_t {
 
 #define STM32L0_SYSTEM_RESET_POWERON           0
 #define STM32L0_SYSTEM_RESET_EXTERNAL          1
-#define STM32L0_SYSTEM_RESET_SOFTWARE          2
-#define STM32L0_SYSTEM_RESET_WATCHDOG          3
+#define STM32L0_SYSTEM_RESET_INTERNAL          2
+#define STM32L0_SYSTEM_RESET_SOFTWARE          3
 #define STM32L0_SYSTEM_RESET_FIREWALL          4
-#define STM32L0_SYSTEM_RESET_OTHER             5
-#define STM32L0_SYSTEM_RESET_STANDBY           6
+#define STM32L0_SYSTEM_RESET_WATCHDOG          5
+#define STM32L0_SYSTEM_RESET_CRASH             6
+#define STM32L0_SYSTEM_RESET_STANDBY           7
 
+#define STM32L0_SYSTEM_WAKEUP_NONE             0x00000000
 #define STM32L0_SYSTEM_WAKEUP_PIN              0x00000001
 #define STM32L0_SYSTEM_WAKEUP_ALARM            0x00000002
 #define STM32L0_SYSTEM_WAKEUP_TIMEOUT          0x00000004
@@ -179,9 +179,9 @@ extern void     stm32l0_system_periph_enable(unsigned int periph);
 extern void     stm32l0_system_periph_disable(unsigned int periph);
 extern void     stm32l0_system_swd_enable(void);
 extern void     stm32l0_system_swd_disable(void);
-extern uint32_t stm32l0_system_read_backup(unsigned int index);
-extern void     stm32l0_system_write_backup(unsigned int index, uint32_t data);
-extern void     stm32l0_system_notify(stm32l0_system_notify_t *notify, stm32l0_system_callback_t callback, void *context, uint32_t events); 
+extern void     stm32l0_system_register(stm32l0_system_notify_t *notify, stm32l0_system_callback_t callback, void *context, uint32_t events); 
+extern void     stm32l0_system_unregister(stm32l0_system_notify_t *notify);
+extern void     stm32l0_system_notify(uint32_t events); 
 extern void     stm32l0_system_lock(uint32_t lock); 
 extern void     stm32l0_system_unlock(uint32_t lock);
 extern void     stm32l0_system_reference(uint32_t reference); 

system/STM32L0xx/Lib/libstm32l052xx.a

@@ -1081,7 +1081,7 @@ bool stm32l0_i2c_create(stm32l0_i2c_t *i2c, const stm32l0_i2c_params_t *params)
 
     if (!stm32l0_i2c_device.notify.callback)
     {
-        stm32l0_system_notify(&stm32l0_i2c_device.notify, stm32l0_i2c_notify_callback, NULL, (STM32L0_SYSTEM_EVENT_STOP_ENTER | STM32L0_SYSTEM_EVENT_STOP_LEAVE));
+        stm32l0_system_register(&stm32l0_i2c_device.notify, stm32l0_i2c_notify_callback, NULL, (STM32L0_SYSTEM_EVENT_STOP_ENTER | STM32L0_SYSTEM_EVENT_STOP_LEAVE));
     }
 
     return true;

system/STM32L0xx/Lib/libstm32l072xx.a

@@ -331,21 +331,21 @@ static void stm32l0_sfspi_callback(void *context, uint32_t events)
     {
         if (sfspi->ID[0] == SFLASH_MID_MACRONIX)
         {
-            /* lock/unlock will block shared interrupts and USB/MSC.
+            /* acquire/release will block shared interrupts and USB/MSC.
              */
 
-            stm32l0_sfspi_lock(sfspi);
-            
             if (sfspi->state == STM32L0_SFSPI_STATE_READY)
             {
-                stm32l0_sfspi_select(sfspi);
+		stm32l0_spi_acquire(sfspi->spi, 32000000, 0);
+
+		stm32l0_sfspi_select(sfspi);
                 stm32l0_spi_data(sfspi->spi, SFLASH_CMD_DPD);
                 stm32l0_sfspi_unselect(sfspi);
 
-                sfspi->state = STM32L0_SFSPI_STATE_SLEEP;
-            }
+		stm32l0_spi_release(sfspi->spi);
 
-            stm32l0_sfspi_unlock(sfspi);
+		sfspi->state = STM32L0_SFSPI_STATE_SLEEP;
+            }
         }
     }
 }
@@ -409,7 +409,7 @@ bool stm32l0_sfspi_initialize(stm32l0_spi_t *spi, const stm32l0_sfspi_params_t *
         {
             sfspi->state = STM32L0_SFSPI_STATE_READY;
 
-            stm32l0_system_notify(&stm32l0_sfspi.notify, stm32l0_sfspi_callback, (void*)&stm32l0_sfspi, STM32L0_SYSTEM_EVENT_SLEEP);
+            stm32l0_system_register(&stm32l0_sfspi.notify, stm32l0_sfspi_callback, (void*)&stm32l0_sfspi, STM32L0_SYSTEM_EVENT_SLEEP);
         }
     }