X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fcore%2Fcore.h;h=b906bf2c6463b60e1831c49443e726db8b3e36e6;hb=f508d39c0a2c145a5a9e0ee8aab63b7b5bcd61c7;hp=0e127224209a33c5061e2b0ee043f6cdd1ed763c;hpb=251726c276ab844095583d4c8d7607a30c0a802c;p=ppcskel.git

diff --git a/usb/core/core.h b/usb/core/core.h
index 0e12722..b906bf2 100644
--- a/usb/core/core.h
+++ b/usb/core/core.h
@@ -42,65 +42,100 @@
 #include "../../bootmii_ppc.h"
 inline static void wait_ms(int ms)
 {
-	int i=0;
-	for(;i<ms;i++)
+	while(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 {
-	u8  address;
-	u8  fullspeed;
-	u8  bMaxPacketSize0;
-	u8  bDeviceClass;
-	u8  bDeviceSubClass;
-	u8  bDeviceProtocoll;
-	u32 idVendor;
-	u32 idProduct;
-	u32 bcdDevice;
-	u8  bNumConfigurations;
+struct usb_device {
+	u8 address;
+	u8 fullspeed;
+
+	/* device descriptor */
+	u8 bLength;
+	u8 bDescriptorType;
+	u16 bcdUSB;
+	u8 bDeviceClass;
+	u8 bDeviceSubClass;
+	u8 bDeviceProtocoll;
+	u8 bMaxPacketSize0;
+	u16 idVendor;
+	u16 idProduct;
+	u16 bcdDevice;
+	u8 iManufacturer;
+	u8 iProduct;
+	u8 iSerialNumber;
+	u8 bNumConfigurations;
 
 	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;
+
+	struct usb_conf *next;
+	struct usb_intf *intf;
+};
 
-typedef struct usb_endpoint_t usb_endpoint;
-struct usb_endpoint_t {
-	u8 type;
-	u8 size;
-	u8 togl;
-	usb_endpoint *next;
+struct usb_intf {
+	u8 bLength;
+	u8 bDescriptorType;
+	u8 bInterfaceNumber;
+	u8 bAlternateSetting;
+	u8 bNumEndpoints;
+	u8 bInterfaceClass;
+	u8 bInterfaceSubClass;
+	u8 bInterfaceProtocol;
+	u8 iInterface;
+
+	struct usb_intf *next;
+	struct usb_endp *endp;
 };
 
+struct usb_endp {
+	u8 bLength;
+	u8 bDescriptorType;
+	u8 bEndpointAddress;
+	u8 bmAttributes;
+	u16 wMaxPacketSize;
+	u8 bInterval;
 
+	struct usb_endp *next;
+};
 
+struct usb_endpoint {
+	u8 type;
+	u8 size;
+	u8 togl;
+	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;
 };
 
 
@@ -108,15 +143,15 @@ struct usb_driver_t {
  * I/O Request Block
  */
 
-typedef struct usb_irp_t usb_irp;
-struct usb_irp_t {
-	//u8 devaddress;
-	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;
 
-	char * buffer;
+	u8 *buffer;
 	u16 len;
 
 	//list * td_list;
@@ -127,30 +162,30 @@ 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;
+	u8 fullspeed;
 	
 	// TODO: zusammenfassen!
 	u8 pid;
 	u8 iso;
 	u8 togl;	
 	
-	char * buffer;
+	u8 *buffer;
 	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();
@@ -158,19 +193,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 lowspeed);
+u8 usb_remove_device(struct usb_device *dev);
+u8 usb_register_driver(struct usb_driver *driver);
 void usb_probe_driver();
 
+void lsusb(struct usb_device *dev);
 
-
-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