Internal optimizations

Author: tyler-gilbert

doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "Stratify OS"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.7.0
+PROJECT_NUMBER         = 4.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -1078,7 +1078,7 @@ IGNORE_PREFIX          =
 # If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
 # The default value is: YES.
 
-GENERATE_HTML          = NO
+GENERATE_HTML          = YES
 
 # The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1622,7 +1622,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1793,7 +1793,7 @@ LATEX_TIMESTAMP        = NO
 # readers/editors.
 # The default value is: NO.
 
-GENERATE_RTF           = NO
+GENERATE_RTF           = YES
 
 # The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -1929,7 +1929,7 @@ XML_PROGRAMLISTING     = YES
 # that can be used to generate PDF.
 # The default value is: NO.
 
-GENERATE_DOCBOOK       = NO
+GENERATE_DOCBOOK       = YES
 
 # The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
@@ -1946,7 +1946,7 @@ DOCBOOK_OUTPUT         = docbook
 # The default value is: NO.
 # This tag requires that the tag GENERATE_DOCBOOK is set to YES.
 
-DOCBOOK_PROGRAMLISTING = NO
+DOCBOOK_PROGRAMLISTING = YES
 
 #---------------------------------------------------------------------------
 # Configuration options for the AutoGen Definitions output

include/device/drive_sdio.h

@@ -9,10 +9,17 @@
 
 typedef struct {
   u32 flags;
+  void *async_buffer;
+  devfs_async_t *async;
+  int bytes_read;
+  int async_nbyte;
+  mcu_event_handler_t async_handler;
 } drive_sdio_state_t;
 
 typedef struct {
   devfs_device_t device;
+  void * dma_read_buffer;
+  u16 dma_read_buffer_size;
 } drive_sdio_config_t;
 
 int drive_sdio_open(const devfs_handle_t *handle) MCU_ROOT_EXEC_CODE;
@@ -22,13 +29,4 @@ int drive_sdio_read(const devfs_handle_t *handle, devfs_async_t *rop) MCU_ROOT_E
 int drive_sdio_write(const devfs_handle_t *handle, devfs_async_t *wop) MCU_ROOT_EXEC_CODE;
 int drive_sdio_close(const devfs_handle_t *handle);
 
-int drive_sdio_dma_open(const devfs_handle_t *handle) MCU_ROOT_EXEC_CODE;
-int drive_sdio_dma_ioctl(const devfs_handle_t *handle, int request, void *ctl)
-  MCU_ROOT_EXEC_CODE;
-int drive_sdio_dma_read(const devfs_handle_t *handle, devfs_async_t *rop)
-  MCU_ROOT_EXEC_CODE;
-int drive_sdio_dma_write(const devfs_handle_t *handle, devfs_async_t *wop)
-  MCU_ROOT_EXEC_CODE;
-int drive_sdio_dma_close(const devfs_handle_t *handle) MCU_ROOT_EXEC_CODE;
-
 #endif /* DEVICE_SD_SPI_H_ */

include/sos/dev/core.h

@@ -110,6 +110,7 @@ typedef enum {
   CORE_PERIPH_DFSDM /*! DFSDM Pins */,
   CORE_PERIPH_FMP_I2C /*! Fast Mode Plus I2C */,
   CORE_PERIPH_DCMI /*! Digital Camera interface */,
+  CORE_PERIPH_OCTOSPI /*! Digital Camera interface */,
   CORE_PERIPH_TOTAL
 } core_periph_t;
 

include/sos/dev/netif.h

@@ -17,46 +17,49 @@
 #ifndef SOS_DEV_NETIF_H_
 #define SOS_DEV_NETIF_H_
 
-#include <sdk/types.h>
 #include "sos/link/types.h"
+#include <sdk/types.h>
 
 #define NETIF_VERSION (0x030100)
 #define NETIF_IOC_CHAR 'N'
 
 #define NETIF_MAX_MAC_ADDRESS_SIZE 16
 
 enum {
-	NETIF_FLAG_INIT /*! When setting attributes, initializes the interface */ = (1<<0),
-	NETIF_FLAG_DEINIT /*! When setting attributes, de-initialies the interface */ = (1<<1),
-	NETIF_FLAG_IS_LINK_UP /*! When settings attributes, ioctl() return 1 if link is up */ = (1<<2),
-	NETIF_FLAG_SET_LINK_UP /*! When setting attributes, sets the link as up */ = (1<<3),
-	NETIF_FLAG_SET_LINK_DOWN /*! When setting attributes, sets the link as down */ = (1<<4),
-	NETIF_FLAG_SET_MAC_ADDRESS /*! Sets the MAC address populated by I_NETIF_GETINFO */ = (1<<5),
-	NETIF_FLAG_IS_BROADCAST = (1<<6),
-	NETIF_FLAG_IS_ETHERNET = (1<<7),
-	NETIF_FLAG_IS_ETHERNET_ARP = (1<<8),
-	NETIF_FLAG_IS_IGMP = (1<<9),
-	NETIF_FLAG_IS_MLD6 = (1<<10),
+  NETIF_FLAG_INIT /*! When setting attributes, initializes the interface */ = (1 << 0),
+  NETIF_FLAG_DEINIT /*! When setting attributes, de-initialies the interface */ =
+    (1 << 1),
+  NETIF_FLAG_IS_LINK_UP /*! When settings attributes, ioctl() return 1 if link is up */ =
+    (1 << 2),
+  NETIF_FLAG_SET_LINK_UP /*! When setting attributes, sets the link as up */ = (1 << 3),
+  NETIF_FLAG_SET_LINK_DOWN /*! When setting attributes, sets the link as down */ =
+    (1 << 4),
+  NETIF_FLAG_SET_MAC_ADDRESS /*! Sets the MAC address populated by I_NETIF_GETINFO */ =
+    (1 << 5),
+  NETIF_FLAG_IS_BROADCAST = (1 << 6),
+  NETIF_FLAG_IS_ETHERNET = (1 << 7),
+  NETIF_FLAG_IS_ETHERNET_ARP = (1 << 8),
+  NETIF_FLAG_IS_IGMP = (1 << 9),
+  NETIF_FLAG_IS_MLD6 = (1 << 10),
 };
 
 typedef struct MCU_PACK {
-	u32 o_flags;
-	u32 o_events;
-	u8 mac_address[NETIF_MAX_MAC_ADDRESS_SIZE];
-	u8 mac_address_length;
-	u8 resd;
-	u16 mtu;
+  u32 o_flags;
+  u32 o_events;
+  u8 mac_address[NETIF_MAX_MAC_ADDRESS_SIZE];
+  u8 mac_address_length;
+  u8 resd;
+  u16 mtu;
 } netif_info_t;
 
 /*! \brief Network Interface attributes
  */
 typedef struct MCU_PACK {
-	u32 o_flags;
-	u16 mtu;
-	u8 mac_address[NETIF_MAX_MAC_ADDRESS_SIZE];
+  u32 o_flags;
+  u16 mtu;
+  u8 mac_address[NETIF_MAX_MAC_ADDRESS_SIZE];
 } netif_attr_t;
 
-
 #define I_NETIF_GETVERSION _IOCTL(NETIF_IOC_CHAR, I_MCU_GETVERSION)
 
 /*! \brief See below for details.

include/sos/dev/pwm.h

@@ -90,8 +90,8 @@ typedef struct MCU_PACK {
  */
 #define I_PWM_SETCHANNEL _IOCTLW(PWM_IOC_IDENT_CHAR, I_MCU_TOTAL + 0, mcu_channel_t)
 #define I_PWM_GETCHANNEL _IOCTLRW(PWM_IOC_IDENT_CHAR, I_MCU_TOTAL + 1, mcu_channel_t)
-#define I_PWM_SET _IOCTL(TMR_IOC_IDENT_CHAR, I_MCU_TOTAL + 2)
-#define I_PWM_GET _IOCTL(TMR_IOC_IDENT_CHAR, I_MCU_TOTAL + 3)
+#define I_PWM_SET _IOCTL(PWM_IOC_IDENT_CHAR, I_MCU_TOTAL + 2)
+#define I_PWM_GET _IOCTL(PWM_IOC_IDENT_CHAR, I_MCU_TOTAL + 3)
 #define I_PWM_ENABLE _IOCTL(PWM_IOC_IDENT_CHAR, I_MCU_TOTAL + 4)
 #define I_PWM_DISABLE _IOCTL(PWM_IOC_IDENT_CHAR, I_MCU_TOTAL + 5)
 

src/boot/boot_main.c

@@ -23,13 +23,12 @@ void boot_invoke_bootloader(void *args) {
   *bootloader_software_request_address =
     sos_config.boot.software_bootloader_request_value;
 
+  sos_config.cache.clean_data();
   cortexm_reset(0);
 }
 
 void sos_handle_event(int event, void *args) {
-  if (sos_config.event_handler != NULL) {
-    sos_config.event_handler(event, args);
-  }
+  sos_config.event_handler(event, args);
 }
 
 extern u32 _etext;

src/device/drive_sdio.c

@@ -12,22 +12,90 @@
 #include "cortexm/task.h"
 
 int drive_sdio_open(const devfs_handle_t *handle) {
-  const drive_sdio_config_t *config = handle->config;
+  DEVFS_DRIVER_DECLARE_CONFIG(drive_sdio);
   return config->device.driver.open(&config->device.handle);
 }
 
+static int handle_misaligned_read_complete(void *context, const mcu_event_t *event) {
+  MCU_UNUSED_ARGUMENT(event);
+  const devfs_handle_t *handle = context;
+  DEVFS_DRIVER_DECLARE_CONFIG_STATE(drive_sdio);
+
+  // copy the data to the original buffer
+  memcpy(
+    (u8 *)state->async_buffer + state->bytes_read, config->dma_read_buffer,
+    state->async->nbyte);
+
+  state->bytes_read += state->async->nbyte;
+
+  int result = 0;
+
+  if (state->bytes_read < state->async_nbyte) {
+    // read another block
+    result = config->device.driver.read(&config->device.handle, state->async);
+  } else {
+    // finalize the transaction
+    result = state->async_nbyte;
+  }
+
+  if (result != 0) {
+    // restore the async object
+    state->async->buf = state->async_buffer;
+    state->async->nbyte = state->async_nbyte;
+    state->async->handler = state->async_handler;
+
+    // mark as not busy
+    state->async_handler.callback = 0;
+    state->async->result = result;
+
+    if (result < 0) {
+      devfs_execute_event_handler(
+        &state->async->handler, MCU_EVENT_FLAG_ERROR | MCU_EVENT_FLAG_CANCELED, 0);
+    } else {
+      devfs_execute_event_handler(&state->async->handler, MCU_EVENT_FLAG_DATA_READY, 0);
+    }
+
+    return 0;
+  }
+}
+
 int drive_sdio_read(const devfs_handle_t *handle, devfs_async_t *async) {
-  const drive_sdio_config_t *config = handle->config;
+  DEVFS_DRIVER_DECLARE_CONFIG_STATE(drive_sdio);
+  if (config->dma_read_buffer) {
+    if (state->async_handler.callback != 0) {
+      return SYSFS_SET_RETURN(EBUSY);
+    }
+
+    if ((u32)async->buf % 32) {
+      // can't have misaligned reads -- need to use the dedicated buffer
+      // save the originals
+      state->async_buffer = async->buf;
+      state->async_handler = async->handler;
+      state->async_nbyte = async->nbyte;
+      state->bytes_read = 0;
+      state->async = async;
+
+      // re-route the async object to use the aligned DMA buffer
+      async->buf = config->dma_read_buffer;
+      async->handler.callback = handle_misaligned_read_complete;
+      async->handler.context = (void *)handle;
+
+      // adjust the size accordingly
+      if (async->nbyte > config->dma_read_buffer_size) {
+        async->nbyte = config->dma_read_buffer_size;
+      }
+    }
+  }
   return config->device.driver.read(&config->device.handle, async);
 }
 
 int drive_sdio_write(const devfs_handle_t *handle, devfs_async_t *async) {
-  const drive_sdio_config_t *config = handle->config;
+  DEVFS_DRIVER_DECLARE_CONFIG(drive_sdio);
   return config->device.driver.write(&config->device.handle, async);
 }
 
 int drive_sdio_ioctl(const devfs_handle_t *handle, int request, void *ctl) {
-  const drive_sdio_config_t *config = handle->config;
+  DEVFS_DRIVER_DECLARE_CONFIG(drive_sdio);
   drive_info_t *info = ctl;
   drive_attr_t *attr = ctl;
   u32 o_flags;
@@ -103,7 +171,7 @@ int drive_sdio_ioctl(const devfs_handle_t *handle, int request, void *ctl) {
 }
 
 int drive_sdio_close(const devfs_handle_t *handle) {
-  const drive_sdio_config_t *config = handle->config;
+  DEVFS_DRIVER_DECLARE_CONFIG(drive_sdio);
   return config->device.driver.close(&config->device.handle);
 }
 

src/sys/sysfs/assetfs.c

@@ -24,7 +24,8 @@ typedef struct {
   u32 checksum;
 } assetfs_handle_t;
 
-int assetfs_init(const void *cfg) {
+int assetfs_init(const void *config) {
+  MCU_UNUSED_ARGUMENT(config);
   // nothing to initialize
   return 0;
 }
@@ -33,8 +34,8 @@ static int get_directory_entry(const void *cfg, int loc, const assetfs_dirent_t
 static const assetfs_dirent_t *find_file(const void *cfg, const char *path, int *ino);
 static void assign_stat(int ino, const assetfs_dirent_t *entry, struct stat *st);
 
-int assetfs_startup(const void *cfg) {
-  // check for any applications that are embedded and start them?
+int assetfs_startup(const void *config) {
+  MCU_UNUSED_ARGUMENT(config);
   return 0;
 }
 
@@ -153,6 +154,7 @@ void assign_stat(int ino, const assetfs_dirent_t *entry, struct stat *st) {
 }
 
 int assetfs_opendir(const void *cfg, void **handle, const char *path) {
+  MCU_UNUSED_ARGUMENT(cfg);
   if (strncmp(path, "", PATH_MAX) == 0) {
     *handle = VALID_DIR_HANDLE;
   } else {
@@ -179,6 +181,7 @@ int assetfs_readdir_r(const void *cfg, void *handle, int loc, struct dirent *ent
 }
 
 int assetfs_closedir(const void *cfg, void **handle) {
+  MCU_UNUSED_ARGUMENT(cfg);
   if (*handle != VALID_DIR_HANDLE) {
     return SYSFS_SET_RETURN(EINVAL);
   }
@@ -203,7 +206,7 @@ const assetfs_dirent_t *find_file(const void *cfg, const char *path, int *ino) {
 
 int get_directory_entry(const void *cfg, int loc, const assetfs_dirent_t **entry) {
   const assetfs_config_t *config = cfg;
-  const u32 count = config->count;
+  const int count = config->count;
   if (loc < 0) {
     return SYSFS_SET_RETURN(EINVAL);
   }