projects / bertos.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
USB: coding style fixes (structure naming)
[bertos.git] / bertos / cpu / cortex-m3 / drv / usb_stm32.c
diff --git a/bertos/cpu/cortex-m3/drv/usb_stm32.c b/bertos/cpu/cortex-m3/drv/usb_stm32.c
index f314f99f2f17470190dd381434fb807447c3b73a..55e27788f5876f313921a03fd4538d801420a20f 100644 (file)
--- a/bertos/cpu/cortex-m3/drv/usb_stm32.c
+++ b/bertos/cpu/cortex-m3/drv/usb_stm32.c
@@ -87,7 +87,7 @@ static struct stm32_usb *usb = (struct stm32_usb *)USB_BASE_ADDR;
 static stm32_usb_ep_t ep_cnfg[ENP_MAX_NUMB];
 
 /* USB EP0 control descriptor */
-static const usb_endpoint_descriptor_t USB_CtrlEpDescr0 =
+static const UsbEndpointDesc USB_CtrlEpDescr0 =
 {
        .bLength = sizeof(USB_CtrlEpDescr0),
        .bDescriptorType = USB_DT_ENDPOINT,
@@ -98,7 +98,7 @@ static const usb_endpoint_descriptor_t USB_CtrlEpDescr0 =
 };
 
 /* USB EP1 control descriptor */
-static const usb_endpoint_descriptor_t USB_CtrlEpDescr1 =
+static const UsbEndpointDesc USB_CtrlEpDescr1 =
 {
        .bLength = sizeof(USB_CtrlEpDescr1),
        .bDescriptorType = USB_DT_ENDPOINT,
@@ -109,7 +109,7 @@ static const usb_endpoint_descriptor_t USB_CtrlEpDescr1 =
 };
 
 /* USB setup packet */
-static usb_ctrlrequest_t setup_packet;
+static UsbCtrlRequest setup_packet;
 
 /* USB device controller: max supported interfaces */
 #define USB_MAX_INTERFACE      1
@@ -123,7 +123,7 @@ typedef struct stm32_udc
 {
        uint8_t state;
        uint32_t cfg_id;
-       const usb_config_descriptor_t *cfg;
+       const UsbConfigDesc *cfg;
        uint32_t interfaces;
        uint32_t alt[USB_MAX_INTERFACE];
        uint32_t address;
@@ -134,7 +134,7 @@ typedef struct stm32_udc
 static stm32_udc_t udc;
 
 /* Generic USB Device Controller structure */
-static struct usb_device *usb_dev;
+static UsbDevice *usb_dev;
 
 /* USB packet memory management: list of allocated chunks */
 static pack_mem_slot_t *pPacketMemUse;
@@ -740,7 +740,7 @@ static void usb_ep_low_level_config(int ep, uint16_t offset, uint16_t size)
 }
 
 /* Enable/Disable an endpoint */
-static int usb_ep_configure(const usb_endpoint_descriptor_t *epd, bool enable)
+static int usb_ep_configure(const UsbEndpointDesc *epd, bool enable)
 {
        int EP;
        stm32_usb_ep_t *ep_hw;
@@ -767,7 +767,7 @@ static int usb_ep_configure(const usb_endpoint_descriptor_t *epd, bool enable)
                ep_hw->flags = 0;
 
                /* Set endpoint type */
-               ep_hw->type = usb_endpoint_type(epd);
+               ep_hw->type = usb_endpointType(epd);
                /* Init EP max packet size */
                ep_hw->max_size = epd->wMaxPacketSize;
 
@@ -781,6 +781,8 @@ static int usb_ep_configure(const usb_endpoint_descriptor_t *epd, bool enable)
                /* Set Ep Address */
                EpCtrlSet_EA(hw, EP >> 1);
                ep_hw->hw = hw;
+               LOG_INFO("%s: EP%d-%s configured\n",
+                               __func__, EP >> 1, EP & 1 ? "IN" : "OUT");
 
                /* Low-level endpoint configuration */
                usb_ep_low_level_config(EP, Offset, MaxPacketSizeTmp);
@@ -927,13 +929,13 @@ static void USB_StallCtrlEP(void)
  */
 static int usb_find_interface(uint32_t num, uint32_t alt)
 {
-       usb_interface_descriptor_t *id;
+       const UsbInterfaceDesc *id;
        int i;
 
        for (i = 0; ; i++)
        {
                /* TODO: support more than one configuration per device */
-               id = (usb_interface_descriptor_t *)usb_dev->config[i];
+               id = (const UsbInterfaceDesc *)usb_dev->config[i];
                if (id == NULL)
                        break;
                if (id->bDescriptorType != USB_DT_INTERFACE)
@@ -951,7 +953,7 @@ static int usb_find_interface(uint32_t num, uint32_t alt)
 static void
 usb_configure_ep_interface(unsigned int num, unsigned int alt, bool enable)
 {
-       usb_endpoint_descriptor_t *epd;
+       const UsbEndpointDesc *epd;
        int i, start;
 
        /*
@@ -974,9 +976,11 @@ usb_configure_ep_interface(unsigned int num, unsigned int alt, bool enable)
         */
        for (i = start + 1; ; i++)
        {
-               epd = (usb_endpoint_descriptor_t *)usb_dev->config[i];
-               if ((epd == NULL) || (epd->bDescriptorType != USB_DT_ENDPOINT))
+               epd = (const UsbEndpointDesc *)usb_dev->config[i];
+               if ((epd == NULL) || (epd->bDescriptorType == USB_DT_INTERFACE))
                        break;
+               if (epd->bDescriptorType != USB_DT_ENDPOINT)
+                       continue;
                if (UNLIKELY(usb_ep_configure(epd, enable) < 0))
                {
                        LOG_ERR("%s: out of memory, can't initialize EP\n",
@@ -1101,7 +1105,7 @@ ssize_t usb_ep_read(int ep, void *buffer, ssize_t size)
        /* Non-blocking read for EP0 */
        if (ep_num == CTRL_ENP_OUT)
        {
-               size = usb_size(size, setup_packet.wLength);
+               size = usb_size(size, usb_le16_to_cpu(setup_packet.wLength));
                if (!size)
                        USB_StatusHandler(ep_num);
                else
@@ -1146,7 +1150,7 @@ ssize_t usb_ep_write(int ep, const void *buffer, ssize_t size)
        /* Non-blocking write for EP0 */
        if (ep_num == CTRL_ENP_IN)
        {
-               size = usb_size(size, setup_packet.wLength);
+               size = usb_size(size, usb_le16_to_cpu(setup_packet.wLength));
                if (!size)
                        USB_StatusHandler(ep_num);
                else
@@ -1179,8 +1183,8 @@ static int UsbDevStatus(uint16_t index)
 
        InData = ((uint32_t)udc.feature) & 0xff;
        __usb_ep_write(CTRL_ENP_IN,
-                       (uint8_t *)&InData, sizeof(InData), USB_StatusHandler);
-
+                       (uint8_t *)&InData, sizeof(uint16_t),
+                       USB_StatusHandler);
        return 0;
 }
 
@@ -1189,8 +1193,8 @@ static int UsbInterfaceStatus(UNUSED_ARG(uint16_t, index))
 {
        InData = 0;
        __usb_ep_write(CTRL_ENP_IN,
-                       (uint8_t *)&InData, sizeof(InData), USB_StatusHandler);
-
+                       (uint8_t *)&InData, sizeof(uint16_t),
+                       USB_StatusHandler);
        return 0;
 }
 
@@ -1203,8 +1207,8 @@ static int UsbEpStatus(uint16_t index)
        InData = 0;
        USB_GetStallEP(USB_EpLogToPhysAdd(index), (bool *)&InData);
        __usb_ep_write(CTRL_ENP_IN,
-                       (uint8_t *)&InData, sizeof(InData), USB_StatusHandler);
-
+                       (uint8_t *)&InData, sizeof(uint16_t),
+                       USB_StatusHandler);
        return 0;
 }
 
@@ -1297,7 +1301,7 @@ static int usb_get_device_descriptor(int id)
        usb_dev->device->bMaxPacketSize0 = USB_EP0_MAX_SIZE;
        __usb_ep_write(CTRL_ENP_IN, (const uint8_t *)usb_dev->device,
                        usb_size(usb_dev->device->bLength,
-                       setup_packet.wLength),
+                               usb_le16_to_cpu(setup_packet.wLength)),
                        USB_StatusHandler);
        return 0;
 }
@@ -1307,8 +1311,8 @@ static uint8_t usb_cfg_buffer[USB_BUFSIZE];
 
 static int usb_get_configuration_descriptor(int id)
 {
-       const usb_config_descriptor_t **config =
-                       (const usb_config_descriptor_t **)usb_dev->config;
+       const UsbConfigDesc **config =
+                       (const UsbConfigDesc **)usb_dev->config;
        uint8_t *p = usb_cfg_buffer;
        int i;
 
@@ -1327,22 +1331,23 @@ static int usb_get_configuration_descriptor(int id)
                        return -USB_BUF_OVERFLOW;
                }
        }
-       ((usb_config_descriptor_t *)usb_cfg_buffer)->wTotalLength =
+       ((UsbConfigDesc *)usb_cfg_buffer)->wTotalLength =
                                        usb_cpu_to_le16(p - usb_cfg_buffer);
        __usb_ep_write(CTRL_ENP_IN,
                        usb_cfg_buffer,
                        usb_size(p - usb_cfg_buffer,
-                               setup_packet.wLength),
+                               usb_le16_to_cpu(setup_packet.wLength)),
                        USB_StatusHandler);
        return 0;
 }
 
 static int usb_get_string_descriptor(unsigned int id)
 {
-       usb_string_descriptor_t *lang_str;
+       const UsbStringDesc *lang_str;
        unsigned int lang_id, str_id;
        uint16_t w_index_lo = usb_le16_to_cpu(setup_packet.wIndex) & 0x00ff;
-       uint16_t w_index_hi = (usb_le16_to_cpu(setup_packet.wIndex) & 0xff00) >> 8;
+       uint16_t w_index_hi = (usb_le16_to_cpu(setup_packet.wIndex) &
+                                               0xff00) >> 8;
 
        ASSERT(usb_dev->strings != NULL);
        ASSERT(usb_dev->strings[0] != NULL);
@@ -1353,8 +1358,8 @@ static int usb_get_string_descriptor(unsigned int id)
                /* Find Language index */
                for (lang_id = 0; ; lang_id++)
                {
-                       usb_string_descriptor_t *str = usb_dev->strings[lang_id];
-
+                       const UsbStringDesc *str =
+                                               usb_dev->strings[lang_id];
                        if (UNLIKELY(str == NULL))
                                return -USB_NODEV_ERROR;
                        if ((str->data[0] == w_index_lo) &&
@@ -1371,7 +1376,8 @@ static int usb_get_string_descriptor(unsigned int id)
        }
        __usb_ep_write(CTRL_ENP_IN,
                        lang_str,
-                       usb_size(lang_str->bLength, setup_packet.wLength),
+                       usb_size(lang_str->bLength,
+                               usb_le16_to_cpu(setup_packet.wLength)),
                        USB_StatusHandler);
        return 0;
 }
@@ -1417,7 +1423,7 @@ static void UsbGetDescriptor(void)
 }
 
 /* USB setup packet: class/vendor request handler */
-static void usb_event_handler(struct usb_device *dev)
+static void usb_event_handler(UsbDevice *dev)
 {
        /*
         * TODO: get the appropriate usb_dev in function of the endpoint
@@ -1478,14 +1484,14 @@ static void USB_GetConfigurationHandler(void)
                ep_cnfg[CTRL_ENP_OUT].status = STALLED;
 }
 
-static const usb_config_descriptor_t *usb_find_configuration(int num)
+static const UsbConfigDesc *usb_find_configuration(int num)
 {
-       const usb_config_descriptor_t *cfg;
+       const UsbConfigDesc *cfg;
        int i;
 
        for (i = 0; ; i++)
        {
-               cfg = (const usb_config_descriptor_t *)usb_dev->config[i];
+               cfg = (const UsbConfigDesc *)usb_dev->config[i];
                if (cfg == NULL)
                        break;
                if (cfg->bDescriptorType != USB_DT_CONFIG)
@@ -1498,7 +1504,7 @@ static const usb_config_descriptor_t *usb_find_configuration(int num)
 
 static int UsbSetConfigurationState(uint32_t Configuration)
 {
-       const usb_config_descriptor_t *pCnfg;
+       const UsbConfigDesc *pCnfg;
        unsigned int i;
 
        if (Configuration)
@@ -1855,7 +1861,7 @@ static void usb_init(void)
 }
 
 /* Register an upper layer USB device into the driver */
-int usb_device_register(struct usb_device *dev)
+int usb_device_register(UsbDevice *dev)
 {
 #if CONFIG_KERN
        MOD_CHECK(proc);
A free, realtime operating system for embedded devices - http://bertos.org/