update *_config_t to be compat with *_attr_t

tyler-gilbert · tyler-gilbert · commit 6cbc9f8afc4b · 2021-05-25T16:56:54.000-06:00
diff --git a/include/mcu/adc.h b/include/mcu/adc.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } adc_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   adc_attr_t attr; // default attributes
+  u32 port;
   u32 reference_mv;
 } adc_config_t;
 
diff --git a/include/mcu/crc.h b/include/mcu/crc.h
@@ -11,8 +11,8 @@ extern "C" {
 #endif
 
 typedef struct MCU_PACK {
-  u32 port;
   crc_attr_t attr; // default attributes
+  u32 port;
 } crc_config_t;
 
 typedef struct MCU_PACK {
diff --git a/include/mcu/crypt.h b/include/mcu/crypt.h
@@ -11,8 +11,8 @@ extern "C" {
 #endif
 
 typedef struct {
-  u32 port;
   crypt_attr_t attr;
+  u32 port;
 } crypt_config_t;
 
 #define MCU_CRYPT_IOCTL_REQUEST_DECLARATION(driver_name) \
diff --git a/include/mcu/dac.h b/include/mcu/dac.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } dac_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   dac_attr_t attr; // default attributes
+  u32 port;
   u32 reference_mv;
 } dac_config_t;
 
diff --git a/include/mcu/eint.h b/include/mcu/eint.h
@@ -24,8 +24,8 @@ typedef struct MCU_PACK {
 } eint_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   eint_attr_t attr; // default attributes
+  u32 port;
 } eint_config_t;
 
 int mcu_eint_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
diff --git a/include/mcu/emc.h b/include/mcu/emc.h
@@ -9,35 +9,34 @@
 #ifndef _MCU_EMC_H_
 #define _MCU_EMC_H_
 
-
 #include "sos/dev/emc.h"
 #include "sos/fs/devfs.h"
 
 typedef struct MCU_PACK {
-	u32 value;
+  u32 value;
 } emc_event_data_t;
 
 typedef struct MCU_PACK {
-	emc_attr_t attr; //default attributes
-	u32 base_address;
-	u32 size;
-	u32 freq;
-	u16 data_bus_width;
-	u16 resd;
+  emc_attr_t attr; // default attributes
+  u32 base_address;
+  u32 size;
+  u32 freq;
+  u16 data_bus_width;
+  u16 resd;
 } emc_config_t;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#define MCU_EMC_IOCTL_REQUEST_DECLARATION(driver_name) \
-	DEVFS_DRIVER_DECLARTION_IOCTL_REQUEST(driver_name, getinfo); \
-	DEVFS_DRIVER_DECLARTION_IOCTL_REQUEST(driver_name, setattr); \
-	DEVFS_DRIVER_DECLARTION_IOCTL_REQUEST(driver_name, setaction)
+#define MCU_EMC_IOCTL_REQUEST_DECLARATION(driver_name)                                   \
+  DEVFS_DRIVER_DECLARTION_IOCTL_REQUEST(driver_name, getinfo);                           \
+  DEVFS_DRIVER_DECLARTION_IOCTL_REQUEST(driver_name, setattr);                           \
+  DEVFS_DRIVER_DECLARTION_IOCTL_REQUEST(driver_name, setaction)
 
-#define MCU_EMC_DRIVER_DECLARATION(variant) \
-	DEVFS_DRIVER_DECLARTION(variant); \
-	MCU_EMC_IOCTL_REQUEST_DECLARATION(variant)
+#define MCU_EMC_DRIVER_DECLARATION(variant)                                              \
+  DEVFS_DRIVER_DECLARTION(variant);                                                      \
+  MCU_EMC_IOCTL_REQUEST_DECLARATION(variant)
 
 MCU_EMC_DRIVER_DECLARATION(mcu_emc_sram);
 MCU_EMC_DRIVER_DECLARATION(mcu_emc_sdram);
@@ -53,4 +52,3 @@ MCU_EMC_DRIVER_DECLARATION(mcu_emc_fmc_ahb);
 #endif /* _EMC_H_ */
 
 /*! @} */
-
diff --git a/include/mcu/eth.h b/include/mcu/eth.h
@@ -26,8 +26,8 @@ extern "C" {
 #endif
 
 typedef struct MCU_PACK {
-  u32 port;
   eth_attr_t attr; // default attributes
+  u32 port;
 } eth_config_t;
 
 int mcu_eth_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
diff --git a/include/mcu/hash.h b/include/mcu/hash.h
@@ -7,13 +7,13 @@
 #include "sos/fs/devfs.h"
 
 typedef struct {
-  u32 port;
   hash_attr_t attr;
+  u32 port;
 } hash_config_t;
 
 typedef struct {
-  u32 port;
   u32 attr;
+  u32 port;
 } random_config_t;
 
 typedef random_config_t rng_config_t;
diff --git a/include/mcu/i2c.h b/include/mcu/i2c.h
@@ -22,8 +22,8 @@ typedef struct {
 } i2c_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   i2c_attr_t attr; // default attributes
+  u32 port;
 } i2c_config_t;
 
 int mcu_i2c_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
diff --git a/include/mcu/i2s.h b/include/mcu/i2s.h
@@ -26,8 +26,8 @@ extern "C" {
 #endif
 
 typedef struct MCU_PACK {
-  u32 port;
   i2s_attr_t attr; // default attributes
+  u32 port;
 } i2s_config_t;
 
 typedef struct MCU_PACK {
diff --git a/include/mcu/ltdc.h b/include/mcu/ltdc.h
@@ -24,8 +24,8 @@ typedef struct MCU_PACK {
 } ltdc_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   ltdc_attr_t attr; // default attributes
+  u32 port;
 } ltdc_config_t;
 
 int mcu_ltdc_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
diff --git a/include/mcu/mci.h b/include/mcu/mci.h
@@ -18,29 +18,10 @@
 extern "C" {
 #endif
 
-
-/*! \details
- * \sa periph_open()
- *
- */
 int mcu_mci_open(const devfs_handle_t * handle) MCU_ROOT_CODE;
-/*! \details
- * \sa periph_read()
- *
- */
 int mcu_mci_read(const devfs_handle_t * handle, devfs_async_t * rop) MCU_ROOT_CODE;
-/*! \details
- * \sa periph_write()
- */
 int mcu_mci_write(const devfs_handle_t * handle, devfs_async_t * wop) MCU_ROOT_CODE;
-/*! \details
- * \sa periph_ioctl()
- *
- */
 int mcu_mci_ioctl(const devfs_handle_t * handle, int request, void * ctl) MCU_ROOT_CODE;
-/*! \details
- * \sa periph_close()
- */
 int mcu_mci_close(const devfs_handle_t * handle) MCU_ROOT_CODE;
 
 int mcu_mci_getinfo(const devfs_handle_t * handle, void * ctl) MCU_ROOT_CODE;
diff --git a/include/mcu/mmc.h b/include/mcu/mmc.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } mmc_event_data_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   mmc_attr_t attr; // default attributes
+  u32 port;
 } mmc_config_t;
 
 #define MCU_MMC_IOCTL_REQUEST_DECLARATION(driver_name)                                   \
diff --git a/include/mcu/pwm.h b/include/mcu/pwm.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } pwm_event_data_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   pwm_attr_t attr; // default attributes
+  u32 port;
 } pwm_config_t;
 
 #define MCU_PWM_IOCTL_REQUEST_DECLARATION(driver_name)                                   \
diff --git a/include/mcu/qei.h b/include/mcu/qei.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } qei_event_data_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   qei_attr_t attr;
+  u32 port;
 } qei_config_t;
 
 int mcu_qei_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
diff --git a/include/mcu/qspi.h b/include/mcu/qspi.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } qspi_event_data_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   qspi_attr_t attr; // default attributes
+  u32 port;
 } qspi_config_t;
 
 #define MCU_QSPI_IOCTL_REQUEST_DECLARATION(driver_name)                                  \
diff --git a/include/mcu/rng.h b/include/mcu/rng.h
@@ -17,21 +17,20 @@ extern "C" {
 #endif
 
 typedef struct MCU_PACK {
-	u32 value;
+  u32 value;
 } rng_event_data_t;
 
+int mcu_rng_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
+int mcu_rng_read(const devfs_handle_t *handle, devfs_async_t *rop) MCU_ROOT_CODE;
+int mcu_rng_write(const devfs_handle_t *handle, devfs_async_t *wop) MCU_ROOT_CODE;
+int mcu_rng_ioctl(const devfs_handle_t *handle, int request, void *ctl) MCU_ROOT_CODE;
+int mcu_rng_close(const devfs_handle_t *handle) MCU_ROOT_CODE;
 
-int mcu_rng_open(const devfs_handle_t * handle) MCU_ROOT_CODE;
-int mcu_rng_read(const devfs_handle_t * handle, devfs_async_t * rop) MCU_ROOT_CODE;
-int mcu_rng_write(const devfs_handle_t * handle, devfs_async_t * wop) MCU_ROOT_CODE;
-int mcu_rng_ioctl(const devfs_handle_t * handle, int request, void * ctl) MCU_ROOT_CODE;
-int mcu_rng_close(const devfs_handle_t * handle) MCU_ROOT_CODE;
+int mcu_rng_getinfo(const devfs_handle_t *handle, void *ctl) MCU_ROOT_CODE;
+int mcu_rng_setattr(const devfs_handle_t *handle, void *ctl) MCU_ROOT_CODE;
+int mcu_rng_setaction(const devfs_handle_t *handle, void *ctl) MCU_ROOT_CODE;
 
-int mcu_rng_getinfo(const devfs_handle_t * handle, void * ctl) MCU_ROOT_CODE;
-int mcu_rng_setattr(const devfs_handle_t * handle, void * ctl) MCU_ROOT_CODE;
-int mcu_rng_setaction(const devfs_handle_t * handle, void * ctl) MCU_ROOT_CODE;
-
-int mcu_rng_get(const devfs_handle_t * handle, void * ctl) MCU_ROOT_CODE;
+int mcu_rng_get(const devfs_handle_t *handle, void *ctl) MCU_ROOT_CODE;
 
 #ifdef __cplusplus
 }
diff --git a/include/mcu/rtc.h b/include/mcu/rtc.h
@@ -26,8 +26,8 @@ typedef struct {
 } rtc_event_t;
 
 typedef struct {
-  u32 port;
   rtc_attr_t attr;
+  u32 port;
 } rtc_config_t;
 
 int mcu_rtc_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
diff --git a/include/mcu/sdio.h b/include/mcu/sdio.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } sdio_event_data_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   sdio_attr_t attr; // default attributes
+  u32 port;
 } sdio_config_t;
 
 #define MCU_SDIO_IOCTL_REQUEST_DECLARATION(driver_name)                                  \
diff --git a/include/mcu/spi.h b/include/mcu/spi.h
@@ -21,8 +21,8 @@ typedef struct MCU_PACK {
 } spi_event_data_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   spi_attr_t attr; // default attributes
+  u32 port;
 } spi_config_t;
 
 #define MCU_SPI_IOCTL_REQUEST_DECLARATION(driver_name)                                   \
diff --git a/include/mcu/tmr.h b/include/mcu/tmr.h
@@ -25,8 +25,8 @@ typedef struct MCU_PACK {
 } tmr_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   tmr_attr_t attr;
+  u32 port;
 } tmr_config_t;
 
 #define MCU_TMR_IOCTL_REQUEST_DECLARATION(driver_name)                                   \
diff --git a/include/mcu/uart.h b/include/mcu/uart.h
@@ -22,8 +22,8 @@ typedef struct MCU_PACK {
 } uart_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   uart_attr_t attr; // default attributes
+  u32 port;
   const void *fifo_config;
 } uart_config_t;
 
diff --git a/include/mcu/usb.h b/include/mcu/usb.h
@@ -22,8 +22,8 @@ typedef struct {
 } usb_event_t;
 
 typedef struct MCU_PACK {
-  u32 port;
   usb_attr_t attr; // default attributes
+  u32 port;
 } usb_config_t;
 
 int mcu_usb_open(const devfs_handle_t *handle) MCU_ROOT_CODE;
diff --git a/include/mcu/wdt.h b/include/mcu/wdt.h
diff --git a/include/sos/config.h b/include/sos/config.h
diff --git a/src/cortexm/devfs.c b/src/cortexm/devfs.c
diff --git a/src/link_transport/link1_transport_slave.c b/src/link_transport/link1_transport_slave.c
diff --git a/src/link_transport/link_transport_slave.c b/src/link_transport/link_transport_slave.c
diff --git a/src/sys/scheduler/scheduler.c b/src/sys/scheduler/scheduler.c
diff --git a/src/sys/sysfs/devfs_data_transfer.c b/src/sys/sysfs/devfs_data_transfer.c
