cleaning

units/spi/_spi_init.c

@@ -7,10 +7,9 @@
 
 #define SPI_INTERNAL
 #include "_spi_internal.h"
-#include "_spi_init.h"
 
 /** Allocate data structure and set defaults */
-error_t SPI_preInit(Unit *unit)
+error_t USPI_preInit(Unit *unit)
 {
     struct priv *priv = unit->data = calloc_ck(1, sizeof(struct priv));
     if (priv == NULL) return E_OUT_OF_MEM;
@@ -32,7 +31,7 @@ error_t SPI_preInit(Unit *unit)
 }
 
 /** Finalize unit set-up */
-error_t SPI_init(Unit *unit)
+error_t USPI_init(Unit *unit)
 {
     bool suc = true;
     struct priv *priv = unit->data;
@@ -176,7 +175,7 @@ error_t SPI_init(Unit *unit)
 }
 
 /** Tear down the unit */
-void SPI_deInit(Unit *unit)
+void USPI_deInit(Unit *unit)
 {
     struct priv *priv = unit->data;
 

units/spi/_spi_init.h

@@ -1,20 +0,0 @@
-//
-// Created by MightyPork on 2018/02/03.
-//
-
-#ifndef GEX_F072_SPI_INIT_H
-#define GEX_F072_SPI_INIT_H
-
-#ifndef SPI_INTERNAL
-#error bad include!
-#endif
-
-#include "unit_base.h"
-
-/** Finalize unit set-up */
-error_t SPI_init(Unit *unit);
-
-/** Tear down the unit */
-void SPI_deInit(Unit *unit);
-
-#endif //GEX_F072_SPI_INIT_H

units/spi/_spi_internal.h

@@ -29,4 +29,31 @@ struct priv {
     GPIO_TypeDef *ssn_port;
 };
 
+// ------------------------------------------------------------------------
+
+/** Load from a binary buffer stored in Flash */
+void USPI_loadBinary(Unit *unit, PayloadParser *pp);
+
+/** Write to a binary buffer for storing in Flash */
+void USPI_writeBinary(Unit *unit, PayloadBuilder *pb);
+
+// ------------------------------------------------------------------------
+
+/** Parse a key-value pair from the INI file */
+error_t USPI_loadIni(Unit *unit, const char *key, const char *value);
+
+/** Generate INI file section for the unit */
+void USPI_writeIni(Unit *unit, IniWriter *iw);
+
+// ------------------------------------------------------------------------
+
+/** Allocate data structure and set defaults */
+error_t USPI_preInit(Unit *unit);
+
+/** Finalize unit set-up */
+error_t USPI_init(Unit *unit);
+
+/** Tear down the unit */
+void USPI_deInit(Unit *unit);
+
 #endif //GEX_F072_SPI_INTERNAL_H

units/spi/_spi_settings.c

@@ -7,10 +7,9 @@
 
 #define SPI_INTERNAL
 #include "_spi_internal.h"
-#include "_spi_settings.h"
 
 /** Load from a binary buffer stored in Flash */
-void SPI_loadBinary(Unit *unit, PayloadParser *pp)
+void USPI_loadBinary(Unit *unit, PayloadParser *pp)
 {
     struct priv *priv = unit->data;
 
@@ -31,7 +30,7 @@ void SPI_loadBinary(Unit *unit, PayloadParser *pp)
 }
 
 /** Write to a binary buffer for storing in Flash */
-void SPI_writeBinary(Unit *unit, PayloadBuilder *pb)
+void USPI_writeBinary(Unit *unit, PayloadBuilder *pb)
 {
     struct priv *priv = unit->data;
 
@@ -53,7 +52,7 @@ void SPI_writeBinary(Unit *unit, PayloadBuilder *pb)
 // ------------------------------------------------------------------------
 
 /** Parse a key-value pair from the INI file */
-error_t SPI_loadIni(Unit *unit, const char *key, const char *value)
+error_t USPI_loadIni(Unit *unit, const char *key, const char *value)
 {
     bool suc = true;
     struct priv *priv = unit->data;
@@ -94,7 +93,7 @@ error_t SPI_loadIni(Unit *unit, const char *key, const char *value)
 }
 
 /** Generate INI file section for the unit */
-void SPI_writeIni(Unit *unit, IniWriter *iw)
+void USPI_writeIni(Unit *unit, IniWriter *iw)
 {
     struct priv *priv = unit->data;
 

units/spi/_spi_settings.h

@@ -1,31 +0,0 @@
-//
-// Created by MightyPork on 2018/02/03.
-//
-
-#ifndef GEX_F072_SPI_SETTINGS_H
-#define GEX_F072_SPI_SETTINGS_H
-
-#ifndef SPI_INTERNAL
-#error bad include!
-#endif
-
-#include "unit_base.h"
-
-/** Allocate data structure and set defaults */
-error_t SPI_preInit(Unit *unit);
-
-/** Load from a binary buffer stored in Flash */
-void SPI_loadBinary(Unit *unit, PayloadParser *pp);
-
-/** Write to a binary buffer for storing in Flash */
-void SPI_writeBinary(Unit *unit, PayloadBuilder *pb);
-
-// ------------------------------------------------------------------------
-
-/** Parse a key-value pair from the INI file */
-error_t SPI_loadIni(Unit *unit, const char *key, const char *value);
-
-/** Generate INI file section for the unit */
-void SPI_writeIni(Unit *unit, IniWriter *iw);
-
-#endif //GEX_F072_SPI_SETTINGS_H

units/spi/unit_spi.c

@@ -11,8 +11,6 @@
 
 #define SPI_INTERNAL
 #include "_spi_internal.h"
-#include "_spi_settings.h"
-#include "_spi_init.h"
 
 // SPI master
 
@@ -73,14 +71,14 @@ const UnitDriver UNIT_SPI = {
     .name = "SPI",
     .description = "SPI master",
     // Settings
-    .preInit = SPI_preInit,
-    .cfgLoadBinary = SPI_loadBinary,
-    .cfgWriteBinary = SPI_writeBinary,
-    .cfgLoadIni = SPI_loadIni,
-    .cfgWriteIni = SPI_writeIni,
+    .preInit = USPI_preInit,
+    .cfgLoadBinary = USPI_loadBinary,
+    .cfgWriteBinary = USPI_writeBinary,
+    .cfgLoadIni = USPI_loadIni,
+    .cfgWriteIni = USPI_writeIni,
     // Init
-    .init = SPI_init,
-    .deInit = SPI_deInit,
+    .init = USPI_init,
+    .deInit = USPI_deInit,
     // Function
     .handleRequest = SPI_handleRequest,
 };