some usb stack related clean up; BULK still untested
[ppcskel.git] / usb / core / core.c
index be99b29533099ea5e86a130b5e5c43c2704a2315..a6c84fb2a7dd13aa3409feb94592fa69071052a1 100644 (file)
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+/*
+       ppcskel - a Free Software replacement for the Nintendo/BroadOn bootloader.
+       plugmii core
+
+Copyright (C) 2009     Bernhard Urban <lewurm@gmx.net>
+Copyright (C) 2009     Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
+
+# This code is licensed to you under the terms of the GNU GPL, version 2;
+# see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+*/
 
-//#include <stdlib.h>
 #include "core.h"
 #include "../host/host.h"
 #include "usb.h"
@@ -98,7 +107,7 @@ struct usb_device *usb_add_device(u8 lowspeed, u32 reg)
        dev->bMaxPacketSize0 = lowspeed ? 8 : 64;
        dev->ohci = reg;
 
-       dev->epSize[0] = 64;
+       dev->epSize[0] = 8;
        dev->epSize[1] = 64;
        dev->epSize[2] = 64;
 
@@ -112,40 +121,25 @@ struct usb_device *usb_add_device(u8 lowspeed, u32 reg)
                return (void*) -1;
        }
 
-#define WTF
+//#define WTF
 #ifdef WTF
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololol PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lolololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lolololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lollllool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
-       printf("lololololool PADDING WTF :O lolololololo \n");
+       volatile u8 wzf = 11;
+       if(0 == wzf) {
+               printf("WTF WTF WTF WTF padding??? WTFWTF WTF\n");
+               printf("WTF WTF WTF WTF padding??? WTF WTF WTF\n");
+               printf("WTF TF WTF WTF padding??? WTF WTF WTF\n");
+               printf("WTF WTF TF WTF padding??? WTF WTWTF\n");
+               printf("TF WTF WTF WTF padding??? WTF WTF WTF\n");
+               printf("WTF WTF WTF WT padding??? WTF WF WTF\n");
+               printf("WTF WTF WTF WTF padding??? WTF WTF WTF\n");
+               printf("WTF WTF WTF WTF padding??? WT WTF WTF\n");
+               printf("WTF WTF WTF WTF pdding??? WTF WTF WTF\n");
+               printf("WTF WTF WTF WTF paddin??? WTF WTF WTF\n");
+               printf("WTF WTF WTF WTF padding??? WTF WTF WTF\n");
+               printf("WTF WTF WTF WTF padding?? WT WTF WTF\n");
+               printf("WTF WTF WTF WTF padding??? WTF WTF WTF\n");
+               printf("WTF WTF WTF WTF padding??? WTFWTF WTF\n");
+       }
 #endif
        u8 address = usb_next_address();
        ret = usb_set_address(dev, address);
@@ -160,32 +154,12 @@ struct usb_device *usb_add_device(u8 lowspeed, u32 reg)
        /* print device info */
        lsusb(dev);
 
-       /* select configuration */
-       ret = usb_set_configuration(dev, dev->conf->bConfigurationValue);
-       printf("=============\nusb_set_configuration(ret: %d): %d\n", ret, dev->conf->bConfigurationValue);
-       printf("=============\nusb_get_configuration: %d\n", usb_get_configuration(dev));
-
-#if 0
-       u8 buf[8];
-       memset(buf, 0, 8);
-       usb_control_msg(dev, 0x00, SET_INTERFACE, 0, dev->conf->intf->bInterfaceNumber, 0, buf, 0);
-       printf("=============\nusb_set_interface: %d\n", dev->conf->intf->bInterfaceNumber);
-       hexdump((void*)buf, 8);
-
-       memset(buf, 0, 8);
-       usb_control_msg(dev, 0x81, GET_INTERFACE, 0, dev->conf->intf->bInterfaceNumber, 8, buf, 0);
-       printf("=============\nusb_get_interface: %d\n", buf[0]);
-       hexdump((void*)buf, 8);
-#endif
-
-#if 0
        /* add device to device list */
-       element *tmp = (element *) malloc(sizeof(element));
+       struct element *tmp = (struct element *) malloc(sizeof(struct element));
        tmp->data = (void *) dev;
        list_add_tail(core.devices, tmp);
 
        usb_probe_driver();
-#endif
 
        return dev;
 }
@@ -195,10 +169,11 @@ void lsusb(struct usb_device *dev)
        printf("=== Device Descriptor === \n");
        printf("bLength 0x%02X\n", dev->bLength);
        printf("bDescriptorType 0x%02X\n", dev->bDeviceClass);
-       printf("bcdUSB 0x%02X\n", dev->bcdUSB);
+       printf("bcdUSB 0x%04X\n", dev->bcdUSB);
        printf("bDeviceClass 0x%02X\n", dev->bDeviceClass);
        printf("bDeviceSubClass 0x%02X\n", dev->bDeviceSubClass);
        printf("bDeviceProtocoll 0x%02X\n", dev->bDeviceProtocoll);
+       printf("bMaxPacketSize 0x%02X\n", dev->bMaxPacketSize0);
        printf("idVendor 0x%04X\n", dev->idVendor);
        printf("idProduct 0x%04X\n", dev->idProduct);
        printf("bcdDevice 0x%04X\n", dev->bcdDevice);
@@ -257,19 +232,34 @@ void lsusb(struct usb_device *dev)
  * Find currently detached device and remove
  * data structures
  */
-u8 usb_remove_device(struct usb_device * dev)
+u8 usb_remove_device(struct usb_device *dev)
 {
-       // FIXME!!!! dieser quatsch ist nur temporaer
-       free(core.devices->head);
-       free(core.devices);
-       core.devices = list_create();
+       /* trigger driver for this device */
+       struct usb_driver *drv;
+       struct element *iterator = core.drivers->head;
+       while (iterator != NULL) {
+               drv = (struct usb_driver *) iterator->data;
+               if(drv->data && !memcmp(drv->data, dev, sizeof(struct usb_device))) {
+                       drv->remove();
+                       break;
+               }
+               iterator = iterator->next;
+       }
+
+       /* remove from device list */
+       struct element *tmp = (struct element *) malloc(sizeof(struct element));
+       tmp->data = (void *) dev;
+       list_delete_element(core.devices, tmp);
+
+       printf("REMOVED\n");
+
        return 1;
 }
 
 /**
  * Register new driver at usb stack.
  */
-u8 usb_register_driver(struct usb_driver * dev)
+u8 usb_register_driver(struct usb_driver *dev)
 {
        /* add driver to driver list */
        struct element *tmp = (struct element *) malloc(sizeof(struct element));
@@ -277,7 +267,6 @@ u8 usb_register_driver(struct usb_driver * dev)
        tmp->next = NULL;
        list_add_tail(core.drivers, tmp);
 
-
        /** 
         * first check to find a suitable device 
         * (root hub drivers need this call here)
@@ -451,53 +440,34 @@ u16 usb_submit_irp(struct usb_irp *irp)
                break;
 
        case USB_BULK:
-               core.stdout("bulk\r\n");
-               //u8 runloop=1;
-               //u16 restlength = irp->len;
-               //char * td_buf_ptr=irp->buffer;
-
-               /* schleife die die tds generiert */
-               while (runloop) {
-
+       case USB_INTR:
+               while (runloop && (restlength > 0)) {
                        td = usb_create_transfer_descriptor(irp);
-                       td->endpoint = td->endpoint & 0x7F;                             /* clear direction bit */
-
                        /* max packet size for given endpoint */
                        td->actlen = irp->epsize;
 
-                       /* Generate In Packet  */
-                       if (irp->endpoint & 0x80)
-                               td->pid = USB_PID_IN;
-                       else
-                               /* Generate Out Packet */
-                               td->pid = USB_PID_OUT;
+                       td->pid = irp->endpoint & 0x80 ? USB_PID_IN : USB_PID_OUT;
 
                        /* stop loop if all bytes are send */
-                       if (restlength <= irp->epsize) {
+                       if (restlength < irp->epsize) {
                                runloop = 0;
                                td->actlen = restlength;
                        }
 
                        td->buffer = td_buf_ptr;
                        /* move pointer for next packet */
-                       td_buf_ptr = td_buf_ptr + irp->epsize;
+                       td_buf_ptr += irp->epsize;
 
                        td->togl = togl;
-                       if (togl == 0)
-                               togl = 1;
-                       else
-                               togl = 0;
-                               /**** send token ****/
+                       togl = togl ? 0 : 1;
+                               
+                       /**** send token ****/
                        hcdi_enqueue(td, irp->dev->ohci);
+                       restlength = restlength - irp->epsize;
                        free(td);
                }
-               /* next togl */
-               //if(td->pid == USB_PID_OUT) {
-               //if(togl==0) togl=1; else togl=0;
-               //}
-               irp->dev->epTogl[(irp->endpoint & 0x7F)] = togl;
-
                break;
+               irp->dev->epTogl[(irp->endpoint & 0x7F)] = togl;
        }
        hcdi_fire(irp->dev->ohci);
 
@@ -515,11 +485,12 @@ struct usb_transfer_descriptor *usb_create_transfer_descriptor(struct usb_irp *
                        (struct usb_transfer_descriptor *) malloc(sizeof(struct usb_transfer_descriptor));
 
        td->devaddress = irp->dev->address;
-       td->endpoint = irp->endpoint;
+       td->endpoint = irp->endpoint & 0x7F;
        td->iso = 0;
        td->state = USB_TRANSFER_DESCR_NONE;
        td->maxp = irp->epsize;
        td->fullspeed = irp->dev->fullspeed;
+       td->type = irp->type;
 
        return td;
 }