refactoring ugly typedefs...

diff --git a/usb/core/core.c b/usb/core/core.c
index 5c54b482f6bdb68558f366f6d3ec62b3438e4f74..1571a19cc31943377db7618454a76e527050cf06 100644 (file)
--- a/usb/core/core.c
+++ b/usb/core/core.c
@@ -71,10 +71,10 @@ u8 usb_next_address()
 void usb_periodic()
 {
        // call ever registered driver  
-       usb_driver *drv;
-       element *iterator = core.drivers->head;
+       struct usb_driver *drv;
+       struct element *iterator = core.drivers->head;
        while (iterator != NULL) {
-               drv = (usb_driver *) iterator->data;
+               drv = (struct usb_driver *) iterator->data;
                drv->check();
                iterator = iterator->next;
        }
@@ -86,9 +86,9 @@ void usb_periodic()
  * for the core. usb_add_device expected that
  * the device answers to address zero.
  */
-usb_device *usb_add_device()
+struct usb_device *usb_add_device()
 {
-       usb_device *dev = (usb_device *) malloc(sizeof(usb_device));
+       struct usb_device *dev = (struct usb_device *) malloc(sizeof(struct usb_device));
        dev->address = 0;
        /* send at first time only 8 bytes */
        dev->bMaxPacketSize0 = 8;
@@ -281,7 +281,7 @@ usb_device *usb_add_device()
  * Find currently detached device and remove
  * data structures
  */
-u8 usb_remove_device(usb_device * dev)
+u8 usb_remove_device(struct usb_device * dev)
 {
        // FIXME!!!! dieser quatsch ist nur temporaer
        free(core.devices->head);
@@ -293,10 +293,10 @@ u8 usb_remove_device(usb_device * dev)
 /**
  * Register new driver at usb stack.
  */
-u8 usb_register_driver(usb_driver * dev)
+u8 usb_register_driver(struct usb_driver * dev)
 {
        /* add driver to driver list */
-       element *tmp = (element *) malloc(sizeof(element));
+       struct element *tmp = (struct element *) malloc(sizeof(struct element));
        tmp->data = (void *) dev;
        tmp->next = NULL;
        list_add_tail(core.drivers, tmp);
@@ -320,10 +320,10 @@ u8 usb_register_driver(usb_driver * dev)
 void usb_probe_driver()
 {
        // call ever registered driver  
-       usb_driver *drv;
-       element *iterator = core.drivers->head;
+       struct usb_driver *drv;
+       struct element *iterator = core.drivers->head;
        while (iterator != NULL) {
-               drv = (usb_driver *) iterator->data;
+               drv = (struct usb_driver *) iterator->data;
                drv->probe();
                iterator = iterator->next;
        }
@@ -332,7 +332,7 @@ void usb_probe_driver()
 /**
  * Not implemented.
  */
-usb_irp *usb_get_irp()
+struct usb_irp *usb_get_irp()
 {
        return 0;
 }
@@ -340,7 +340,7 @@ usb_irp *usb_get_irp()
 /**
  * Not implemented.
  */
-u8 usb_remove_irp(usb_irp * irp)
+u8 usb_remove_irp(struct usb_irp *irp)
 {
 
        return 1;
@@ -352,9 +352,9 @@ u8 usb_remove_irp(usb_irp * irp)
  * In the usbstack they are transported with the
  * usb_transfer_descriptor data structure.
  */
-u16 usb_submit_irp(usb_irp *irp)
+u16 usb_submit_irp(struct usb_irp *irp)
 {
-       usb_transfer_descriptor *td;
+       struct usb_transfer_descriptor *td;
        u8 runloop = 1;
        u16 restlength = irp->len;
        u8 *td_buf_ptr = irp->buffer;
@@ -533,10 +533,10 @@ u16 usb_submit_irp(usb_irp *irp)
 /** 
  * Create a transfer descriptor with an parent irp.
  */
-usb_transfer_descriptor *usb_create_transfer_descriptor(usb_irp * irp)
+struct usb_transfer_descriptor *usb_create_transfer_descriptor(struct usb_irp * irp)
 {
-       usb_transfer_descriptor *td =
-                       (usb_transfer_descriptor *) malloc(sizeof(usb_transfer_descriptor));
+       struct usb_transfer_descriptor *td =
+                       (struct usb_transfer_descriptor *) malloc(sizeof(struct usb_transfer_descriptor));
 
        td->devaddress = irp->dev->address;
        td->endpoint = irp->endpoint;

diff --git a/usb/core/core.h b/usb/core/core.h
index ede6bdc7de0a4f7b43944c196a65763cb01106d8..cb521fc394cd8c3861b85595644910f4b81d1252 100644 (file)
--- a/usb/core/core.h
+++ b/usb/core/core.h
@@ -46,13 +46,7 @@ inline static void wait_ms(int ms)
                udelay(1000);
 }
 
-/**
- * Main datastructure of the usbstack, which have to be instanced
- * in the main application.
- */
-
-typedef struct usb_device_t usb_device;
-struct usb_device_t {
+struct usb_device {
        u8 address;
        u8 fullspeed;
 
@@ -75,39 +69,44 @@ struct usb_device_t {
        u8 epSize[16];
        u8 epTogl[16];
 
-       usb_device *next;
+       struct usb_conf *conf;
+       struct usb_device *next;
 };
 
+struct usb_conf {
+       u8 bLength;
+       u8 bDescriptorType;
+       u16 wTotalLength;
+       u8 bNumInterfaces;
+       u8 bConfigurationValue;
+       u8 iConfiguration;
+       u8 bmAttributes;
+       u8 bMaxPower;
+};
 
-typedef struct usb_endpoint_t usb_endpoint;
-struct usb_endpoint_t {
+struct usb_endpoint {
        u8 type;
        u8 size;
        u8 togl;
-       usb_endpoint *next;
+       struct usb_endpoint *next;
 };
 
-
-
-
-typedef struct usb_transfer_descriptor_ep_t usb_transfer_descriptor_ep;
-struct usb_transfer_descriptor_ep_t {
-       usb_transfer_descriptor_ep *next;
+struct usb_transfer_descriptor_ep {
+       struct usb_transfer_descriptor_ep *next;
        u8 device_address;
        u8 endpoint;
-       struct usb_transfer_descriptor_t *start;
+       struct usb_transfer_descriptor *start;
 };
 
 /**
  * USB Driver data structure
  */
-typedef struct usb_driver_t usb_driver;
-struct usb_driver_t {
+struct usb_driver {
        char* name;
        void (*probe)(void);
        void (*check)(void);
        void * data;
-       usb_driver *next;
+       struct usb_driver *next;
 };
 
 
@@ -115,12 +114,13 @@ struct usb_driver_t {
  * I/O Request Block
  */
 
-typedef struct usb_irp_t usb_irp;
-struct usb_irp_t {
-       usb_device * dev;
-       u8 endpoint;                            /* ep -> bit 7 is for direction 1=from  dev to host */
+struct usb_irp {
+       struct usb_device *dev;
+       /* ep -> bit 7 is for direction 1=from  dev to host */
+       u8 endpoint;
        u8 epsize;
-       u8 type;                                /* control, interrupt, bulk or isochron */
+       /* control, interrupt, bulk or isochron */
+       u8 type;
 
        u8 *buffer;
        u16 len;
@@ -133,8 +133,7 @@ struct usb_irp_t {
 /**
  * usb transfer descriptor
  */
-typedef struct usb_transfer_descriptor_t usb_transfer_descriptor;
-struct usb_transfer_descriptor_t {
+struct usb_transfer_descriptor {
        u8 devaddress;
        u8 endpoint;
        
@@ -147,17 +146,16 @@ struct usb_transfer_descriptor_t {
        u16 actlen;
        
        u8 state;
-       usb_transfer_descriptor *next;
+       struct usb_transfer_descriptor *next;
        u8 maxp;
 };
 
-//typedef struct usb_core_t usb_core;
-struct usb_core_t {
+struct usb_core {
        u8 nextaddress;
        void (*stdout)(char * arg); 
        // driver list
-       list * drivers;
-       list * devices;
+       struct list *drivers;
+       struct list *devices;
 } core;
 
 void usb_init();
@@ -165,19 +163,19 @@ void usb_periodic();
 u8 usb_next_address();
 
 
-usb_device * usb_add_device();
-u8 usb_remove_device(usb_device *dev);
-u8 usb_register_driver(usb_driver *driver);
+struct usb_device *usb_add_device();
+u8 usb_remove_device(struct usb_device *dev);
+u8 usb_register_driver(struct usb_driver *driver);
 void usb_probe_driver();
 
 
 
-usb_irp * usb_get_irp();
-u8 usb_remove_irp(usb_irp *irp);
-u16 usb_submit_irp(usb_irp *irp);
+struct usb_irp *usb_get_irp();
+u8 usb_remove_irp(struct usb_irp *irp);
+u16 usb_submit_irp(struct usb_irp *irp);
 
 
-usb_transfer_descriptor * usb_create_transfer_descriptor(usb_irp *irp);
+struct usb_transfer_descriptor *usb_create_transfer_descriptor(struct usb_irp *irp);
 
 
 #define USB_IRP_WAITING                1

diff --git a/usb/core/usb.c b/usb/core/usb.c
index 7a495c03caf3baf6e88b332d0c6833b954396b9a..938b48121cbd9ccf2e3489bdb71a514a7bb0f6ed 100644 (file)
--- a/usb/core/usb.c
+++ b/usb/core/usb.c
@@ -47,12 +47,12 @@
 /**
  * Open a device with verndor- and product-id for a communication.
  */
-usb_device *usb_open(u32 vendor_id, u32 product_id)
+struct usb_device *usb_open(u32 vendor_id, u32 product_id)
 {
-       usb_device* dev;
-       element * iterator = core.devices->head;
+       struct usb_device* dev;
+       struct element * iterator = core.devices->head;
        while(iterator != NULL) {
-               dev = (usb_device*)iterator->data;
+               dev = (struct usb_device*)iterator->data;
                
                if(dev->idVendor==vendor_id&&dev->idProduct==product_id)
                        return dev;
@@ -67,12 +67,12 @@ usb_device *usb_open(u32 vendor_id, u32 product_id)
 /**
  * Open a device with an class code for a communication.
  */
-usb_device *usb_open_class(u8 class)
+struct usb_device *usb_open_class(u8 class)
 {
-       usb_device* dev;
-       element * iterator = core.devices->head;
+       struct usb_device* dev;
+       struct element * iterator = core.devices->head;
        while(iterator != NULL) {
-               dev = (usb_device*)iterator->data;
+               dev = (struct usb_device*)iterator->data;
                
                if(dev->bDeviceClass==class)
                        return dev;
@@ -84,13 +84,13 @@ usb_device *usb_open_class(u8 class)
 
 /* Close device after a communication.
  */
-s8 usb_close(usb_device *dev)
+s8 usb_close(struct usb_device *dev)
 {
 
        return 0;
 }
 
-s8 usb_reset(usb_device *dev)
+s8 usb_reset(struct usb_device *dev)
 {
 
 
@@ -103,10 +103,10 @@ s8 usb_reset(usb_device *dev)
 /**
  * Create a control transfer.
  */
-s8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request,
+s8 usb_control_msg(struct usb_device *dev, u8 requesttype, u8 request,
                u16 value, u16 index, u16 length, u8 *buf, u16 timeout)
 {
-       usb_irp *irp = (usb_irp*)malloc(sizeof(usb_irp));
+       struct usb_irp *irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
        irp->dev = dev;
        irp->endpoint = 0;
        
@@ -133,14 +133,14 @@ s8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request,
 }
 
 
-s8 usb_get_string(usb_device *dev, u8 index, u8 langid, u8 *buf, u8 buflen)
+s8 usb_get_string(struct usb_device *dev, u8 index, u8 langid, u8 *buf, u8 buflen)
 {
 
        return 0;
 }
 
 
-char *usb_get_string_simple(usb_device *dev, u8 index, u8 *buf, u8 size)
+char *usb_get_string_simple(struct usb_device *dev, u8 index, u8 *buf, u8 size)
 {
        if(size < 8) {
                return (char*) -1;
@@ -162,7 +162,7 @@ char *usb_get_string_simple(usb_device *dev, u8 index, u8 *buf, u8 size)
        return str;
 }
 
-s8 usb_get_descriptor(usb_device *dev, u8 type, u8 index, u8 *buf, u8 size)
+s8 usb_get_descriptor(struct usb_device *dev, u8 type, u8 index, u8 *buf, u8 size)
 {
        usb_control_msg(dev, 0x80, GET_DESCRIPTOR, (type << 8) | index, 0, size, buf, 0);
        return 0;
@@ -171,7 +171,7 @@ s8 usb_get_descriptor(usb_device *dev, u8 type, u8 index, u8 *buf, u8 size)
 /* ask first 8 bytes of device descriptor with this special 
  * GET Descriptor Request, when device address = 0
  */
-s8 usb_get_dev_desc_simple(usb_device *dev, u8 *buf, u8 size)
+s8 usb_get_dev_desc_simple(struct usb_device *dev, u8 *buf, u8 size)
 {
        if(size < 8) {
                return -1;
@@ -186,7 +186,7 @@ s8 usb_get_dev_desc_simple(usb_device *dev, u8 *buf, u8 size)
        return 0;
 }
 
-s8 usb_get_dev_desc(usb_device *dev, u8 *buf, u8 size)
+s8 usb_get_dev_desc(struct usb_device *dev, u8 *buf, u8 size)
 {
        if (size < 0x12 || usb_get_dev_desc_simple(dev, buf, size) < 0) {
                return -1;
@@ -210,7 +210,7 @@ s8 usb_get_dev_desc(usb_device *dev, u8 *buf, u8 size)
        return 0;
 }
 
-s8 usb_get_configuration(usb_device *dev, u8 index, u8 *buf, u8 size)
+s8 usb_get_configuration(struct usb_device *dev, u8 index, u8 *buf, u8 size)
 {
        if(size < 8) {
                return -1;
@@ -220,20 +220,20 @@ s8 usb_get_configuration(usb_device *dev, u8 index, u8 *buf, u8 size)
        return 0;
 }
 
-s8 usb_set_address(usb_device *dev, u8 address)
+s8 usb_set_address(struct usb_device *dev, u8 address)
 {
        u8 buf[64];
        usb_control_msg(dev, 0x00, SET_ADDRESS, address, 0, 0, buf, 0);
        return 0;
 }
 
-s8 usb_set_configuration(usb_device *dev, u8 configuration)
+s8 usb_set_configuration(struct usb_device *dev, u8 configuration)
 {
 
        return 0;
 }
 
-s8 usb_set_altinterface(usb_device *dev, u8 alternate)
+s8 usb_set_altinterface(struct usb_device *dev, u8 alternate)
 {
 
        return 0;
@@ -246,9 +246,9 @@ s8 usb_set_altinterface(usb_device *dev, u8 alternate)
 /**
  * Write to an a bulk endpoint.
  */
-s8 usb_bulk_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_bulk_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
-       usb_irp * irp = (usb_irp*)malloc(sizeof(usb_irp));
+       struct usb_irp * irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
        irp->dev = dev;
        //irp->devaddress = dev->address;
        
@@ -269,9 +269,9 @@ s8 usb_bulk_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Read from an bulk endpoint.
  */
-s8 usb_bulk_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_bulk_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
-       usb_irp * irp = (usb_irp*)malloc(sizeof(usb_irp));
+       struct usb_irp * irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
        //irp->devaddress = dev->address;
        irp->dev = dev;
        
@@ -294,7 +294,7 @@ s8 usb_bulk_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Write to an interrupt endpoint.
  */
-s8 usb_interrupt_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_interrupt_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
        return 0;
@@ -303,7 +303,7 @@ s8 usb_interrupt_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Read from an interrupt endpoint.
  */
-s8 usb_interrupt_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_interrupt_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
        return 0;
@@ -315,7 +315,7 @@ s8 usb_interrupt_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Write to an isochron endpoint.
  */
-s8 usb_isochron_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_isochron_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
        return 0;
@@ -324,7 +324,7 @@ s8 usb_isochron_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 /**
  * Read from an isochron endpoint.
  */
-s8 usb_isochron_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
+s8 usb_isochron_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
 
 

diff --git a/usb/core/usb.h b/usb/core/usb.h
index 9dd062064804ed619de06304989fd11ca3825015..1a8c3c22593cfa30afab6ae67611579e15b91d96 100644 (file)
--- a/usb/core/usb.h
+++ b/usb/core/usb.h
@@ -44,16 +44,16 @@
 /******************* Device Operations **********************/
 
 // use an own usb device
-usb_device * usb_open(u32 vendor_id, u32 product_id);
-usb_device * usb_open_class(u8 class);
+struct usb_device *usb_open(u32 vendor_id, u32 product_id);
+struct usb_device *usb_open_class(u8 class);
 
-s8 usb_close(usb_device *dev);
+s8 usb_close(struct usb_device *dev);
 
 
-s8 usb_get_device_descriptor(usb_device *dev, u8 *buf, u8 buflen);
-s8 usb_set_address(usb_device *dev, u8 address);
-s8 usb_set_configuration(usb_device *dev, u8 configuration);
-s8 usb_set_altinterface(usb_device *dev, u8 alternate);
+s8 usb_get_device_descriptor(struct usb_device *dev, u8 *buf, u8 buflen);
+s8 usb_set_address(struct usb_device *dev, u8 address);
+s8 usb_set_configuration(struct usb_device *dev, u8 configuration);
+s8 usb_set_altinterface(struct usb_device *dev, u8 alternate);
 
 
 /**
@@ -61,31 +61,31 @@ s8 usb_set_altinterface(usb_device *dev, u8 alternate);
  * it is connected to. Returns 0 on success or < 0 on error.
  */
 
-s8 usb_reset(usb_device *dev);
+s8 usb_reset(struct usb_device *dev);
 
 
 /******************* Control Transfer **********************/
-s8 usb_control_msg(usb_device *dev, u8 requesttype, u8 request, u16 value, u16 index, u16 length, u8 *buf, u16 timeout);
-s8 usb_get_string(usb_device *dev, u8 index, u8 langid, u8 *buf, u8 buflen);
-char *usb_get_string_simple(usb_device *dev, u8 index, u8 *buf, u8 size);
-s8 usb_get_dev_desc_simple(usb_device *dev, u8 *buf, u8 size);
-s8 usb_get_configuration(usb_device *dev, u8 index, u8 *buf, u8 size);
-s8 usb_get_dev_desc(usb_device *dev, u8 *buf, u8 size);
-s8 usb_get_descriptor(usb_device *dev, u8 type, u8 index, u8 *buf, u8 size);
+s8 usb_control_msg(struct usb_device *dev, u8 requesttype, u8 request, u16 value, u16 index, u16 length, u8 *buf, u16 timeout);
+s8 usb_get_string(struct usb_device *dev, u8 index, u8 langid, u8 *buf, u8 buflen);
+char *usb_get_string_simple(struct usb_device *dev, u8 index, u8 *buf, u8 size);
+s8 usb_get_dev_desc_simple(struct usb_device *dev, u8 *buf, u8 size);
+s8 usb_get_configuration(struct usb_device *dev, u8 index, u8 *buf, u8 size);
+s8 usb_get_dev_desc(struct usb_device *dev, u8 *buf, u8 size);
+s8 usb_get_descriptor(struct usb_device *dev, u8 type, u8 index, u8 *buf, u8 size);
 
 
 /******************* Bulk Transfer **********************/
-s8 usb_bulk_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
-s8 usb_bulk_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
+s8 usb_bulk_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
+s8 usb_bulk_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
 
 
 /******************* Interrupt Transfer **********************/
-s8 usb_u8errupt_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
-s8 usb_u8errupt_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
+s8 usb_u8errupt_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
+s8 usb_u8errupt_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
 
 
 /******************* Isochron Transfer **********************/
-s8 usb_isochron_write(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
-s8 usb_isochron_read(usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
+s8 usb_isochron_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
+s8 usb_isochron_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout);
 
 #endif //_USB_H_

diff --git a/usb/drivers/class/hub.c b/usb/drivers/class/hub.c
index 38c40b3b988343d69b7dac9d01305b9c7b0fdcfc..f86e516d2d3b070b805c1c9dbef100beea74208b 100644 (file)
--- a/usb/drivers/class/hub.c
+++ b/usb/drivers/class/hub.c
@@ -44,7 +44,7 @@ void usb_hub_probe();
 void usb_hub_check();
 
 
-usb_driver hub = {
+struct usb_driver hub = {
        .name     = "hub",
        .probe  = usb_hub_probe,
        .check  = usb_hub_check,
@@ -65,8 +65,7 @@ void usb_hub_probe()
        #endif
        wait_ms(1000);
        
-       usb_device * dev;
-       dev = usb_open_class(HUB_CLASSCODE);
+       struct usb_device *dev = usb_open_class(HUB_CLASSCODE);
        if(dev != NULL){
                hub.data = (void*)dev;          /* save handle */
                #if DEBUG
@@ -97,12 +96,12 @@ void usb_hub_check()
 }
 
 
-u8 usb_hub_get_hub_descriptor(usb_device *dev, char * buf)
+u8 usb_hub_get_hub_descriptor(struct usb_device *dev, char * buf)
 {
        return 0;  
 }
 
-u8 usb_hub_get_hub_status(usb_device *dev, char *buf)
+u8 usb_hub_get_hub_status(struct usb_device *dev, char *buf)
 {
 
 
@@ -110,38 +109,38 @@ u8 usb_hub_get_hub_status(usb_device *dev, char *buf)
 }
 
 
-u8 usb_hub_get_port_status(usb_device *dev, char *buf)
+u8 usb_hub_get_port_status(struct usb_device *dev, char *buf)
 {
 
 
        return 0;  
 }
 
-u8 usb_hub_clear_port_feature(usb_device *dev)
+u8 usb_hub_clear_port_feature(struct usb_device *dev)
 {
 
        return 0;  
 }
 
-u8 usb_hub_set_port_feature(usb_device *dev, u8 value)
+u8 usb_hub_set_port_feature(struct usb_device *dev, u8 value)
 {
 
        return 0;  
 }
 
-u8 usb_hub_clear_hub_feature(usb_device *dev)
+u8 usb_hub_clear_hub_feature(struct usb_device *dev)
 {
 
        return 0;  
 }
 
-u8 usb_hub_set_hub_feature(usb_device *dev)
+u8 usb_hub_set_hub_feature(struct usb_device *dev)
 {
 
        return 0;  
 }
 
-u8 usb_hub_set_hub_descriptor(usb_device *dev)
+u8 usb_hub_set_hub_descriptor(struct usb_device *dev)
 {
 
        return 0;  

diff --git a/usb/drivers/class/storage.c b/usb/drivers/class/storage.c
index 5e565527b018db53eaf4f808d696b6c42a8d52ef..116288d9eed96336ec91d0fd92383b0b320c2368 100644 (file)
--- a/usb/drivers/class/storage.c
+++ b/usb/drivers/class/storage.c
@@ -48,11 +48,11 @@
 void usb_storage_probe();
 void usb_storage_check();
 
-usb_device * massstorage[MAX_DEVICES];
+struct usb_device *massstorage[MAX_DEVICES];
 u16 sectorsize[MAX_DEVICES];
 u8 massstorage_in_use;
 
-usb_driver storage = {
+struct usb_driver storage = {
        .name     = "storage",
        .probe  = usb_storage_probe,
        .check  = usb_storage_check,
@@ -76,11 +76,11 @@ void usb_storage_probe()
        /* read interface descriptor for class code */
        u8 buf[32];
        
-       usb_device* dev;
-       element * iterator = core.devices->head;
+       struct usb_device* dev;
+       struct element * iterator = core.devices->head;
        
        while(iterator != NULL) {
-               dev = (usb_device*)iterator->data;
+               dev = (struct usb_device*)iterator->data;
 
                /* get interface descriptor */
                usb_control_msg(dev, 0x80, GET_DESCRIPTOR,2, 0, 32, buf, 0);

diff --git a/usb/host/host.h b/usb/host/host.h
index fe96aabb71c2747a04e75dd335be228e7c3e22aa..ce341f696c748b53e7d4c626af9d4c23be12e346 100644 (file)
--- a/usb/host/host.h
+++ b/usb/host/host.h
@@ -50,11 +50,11 @@ void hcdi_init();
 /**
  * Enqueue a transfer descriptor.
  */
-u8 hcdi_enqueue(const usb_transfer_descriptor *td);
+u8 hcdi_enqueue(const struct usb_transfer_descriptor *td);
 /**
  * Remove an transfer descriptor from transfer queue.
  */
-u8 hcdi_dequeue(usb_transfer_descriptor *td);
+u8 hcdi_dequeue(struct usb_transfer_descriptor *td);
 
 void hcdi_fire(void);
 

diff --git a/usb/host/ohci.c b/usb/host/ohci.c
index f07aae4a6cdf6300e24badc6a19c7258a8775c4b..f18785ce5d4ced424db6d6ddc2f859ba327de487 100644 (file)
--- a/usb/host/ohci.c
+++ b/usb/host/ohci.c
@@ -83,7 +83,7 @@ static void dbg_td_flag(u32 flag)
 }
 #endif
 
-static void general_td_fill(struct general_td *dest, const usb_transfer_descriptor *src)
+static void general_td_fill(struct general_td *dest, const struct usb_transfer_descriptor *src)
 {
        if(src->actlen) {
                dest->cbp = LE(virt_to_phys(src->buffer));
@@ -305,7 +305,7 @@ void hcdi_fire()
 /**
  * Enqueue a transfer descriptor.
  */
-u8 hcdi_enqueue(const usb_transfer_descriptor *td) {
+u8 hcdi_enqueue(const struct usb_transfer_descriptor *td) {
 #ifdef _DU_OHCI_Q
        printf("*()*()*()*()*()*()*() hcdi_enqueue(start)\n");
 #endif
@@ -354,7 +354,7 @@ u8 hcdi_enqueue(const usb_transfer_descriptor *td) {
 /**
  * Remove an transfer descriptor from transfer queue.
  */
-u8 hcdi_dequeue(usb_transfer_descriptor *td) {
+u8 hcdi_dequeue(struct usb_transfer_descriptor *td) {
        return 0;
 }
 

diff --git a/usb/lib/list.c b/usb/lib/list.c
index efb623cac7d091a0f293aac82981b48beffab6e4..39c94392da4eb7ff0da7530baf56e4b14f8d06cb 100644 (file)
--- a/usb/lib/list.c
+++ b/usb/lib/list.c
@@ -35,14 +35,14 @@
 #include "list.h"
 #include "../../malloc.h"
 
-list* list_create()
+struct list* list_create()
 {
-       list *l = (list*)malloc(sizeof(list));
+       struct list *l = (struct list*)malloc(sizeof(struct list));
        l->head = NULL;
        return l;
 }
 
-u8 list_add_tail(list *l, element *e)
+u8 list_add_tail(struct list *l, struct element *e)
 {
        e->next = NULL;
 
@@ -53,8 +53,7 @@ u8 list_add_tail(list *l, element *e)
        }
 
        /* find last element */
-       element * iterator;
-       iterator = l->head;
+       struct element * iterator = l->head;
 
        while(iterator->next!=NULL) {
                iterator = iterator->next;
@@ -67,13 +66,13 @@ u8 list_add_tail(list *l, element *e)
 
 
 // FIXME: untested and unused!! 
-u8 list_delete_element(list *l, element *e)
+u8 list_delete_element(struct list *l, struct element *e)
 {
        return 1;
 }
 
 // FIXME: untested and unused!! 
-u8 list_is_element_last(list *l, element *e)
+u8 list_is_element_last(struct list *l, struct element *e)
 {
        if(e->next==NULL)
                return 1;
@@ -84,10 +83,9 @@ u8 list_is_element_last(list *l, element *e)
 
 
 // FIXME: untested and unused!! 
-element * list_find_next_element(list *l, element *e)
+struct element *list_find_next_element(struct list *l, struct element *e)
 {
-       element * iterator;
-       iterator = l->head;
+       struct element *iterator = l->head;
 
        while(iterator!=NULL){
                if(iterator == e)

diff --git a/usb/lib/list.h b/usb/lib/list.h
index 1f7d551ad5560cd290d42c890dafe83da5eabe2d..68d8b368739730e4e93c0cd4ea2be81a18a5b157 100644 (file)
--- a/usb/lib/list.h
+++ b/usb/lib/list.h
@@ -37,28 +37,25 @@
 #include "../../types.h"
 
 
-typedef struct element_t element;
-struct element_t {
-       void * data;
-       element * next;
+struct element {
+       void *data;
+       struct element *next;
 };
 
 
-typedef struct list_t list;
-struct list_t {
-       element * head;
+struct list {
+       struct element *head;
 };
 
 
+struct list *list_create(void);
 
-list* list_create();
+u8 list_add_tail(struct list *l, struct element *e);
+u8 list_delete_element(struct list *l, struct element *e);
 
-u8 list_add_tail(list *l, element *e);
-u8 list_delete_element(list *l, element *e);
-
-u8 list_is_element_last(list *l, element *e);
-
-element * list_find_next_element(list *l, element *e);
+u8 list_is_element_last(struct list *l, struct element *e);
 
+struct element *list_find_next_element(struct list *l, struct element *e);
 
 #endif // _LIST_H_
+