license stuff

[ppcskel.git] / usb / core / usb.c

diff --git a/usb/core/usb.c b/usb/core/usb.c
index c0ff3fb1820b863cfa19be899a824045b157516f..8b766b0d2a87df1e55ec0241c74342328852ca63 100644 (file)
--- a/usb/core/usb.c
+++ b/usb/core/usb.c
@@ -34,6 +34,17 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/*
+       ppcskel - a Free Software replacement for the Nintendo/BroadOn bootloader.
+       libusb like interface
+
+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 "usb.h"
 #include "core.h"
 #include "../host/host.h"
@@ -101,7 +112,6 @@ s8 usb_reset(struct usb_device *dev)
 
 
 /******************* Control Transfer **********************/
-
 /**
  * Create a control transfer.
  */
@@ -111,7 +121,7 @@ s8 usb_control_msg(struct usb_device *dev, u8 requesttype, u8 request,
        struct usb_irp *irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
        irp->dev = dev;
        irp->endpoint = 0;
-       
+
        irp->epsize = dev->bMaxPacketSize0;
        irp->type = USB_CTRL;
 
@@ -293,6 +303,8 @@ s8 usb_set_address(struct usb_device *dev, u8 address)
 {
        cleargbuf();
        usb_control_msg(dev, 0x00, SET_ADDRESS, address, 0, 0, gbuf, 0);
+       hexdump((void*) gbuf, 8);
+       wait_ms(210);
        return 0;
 }
 
@@ -302,7 +314,7 @@ u8 usb_get_configuration(struct usb_device *dev)
        cleargbuf();
        usb_control_msg(dev, 0x80, GET_CONFIGURATION, 0, 0, 4, gbuf, 0);
        printf("=============\nafter usb_get_configuration:\n");
-       hexdump((void*) gbuf, 1);
+       hexdump((void*) gbuf, 8);
        return gbuf[0];
 }
 
@@ -310,6 +322,9 @@ s8 usb_set_configuration(struct usb_device *dev, u8 configuration)
 {
        cleargbuf();
        usb_control_msg(dev, 0x00, SET_CONFIGURATION, configuration, 0, 0, gbuf, 0);
+       printf("=============\nafter usb_set_configuration:\n");
+       hexdump((void*) gbuf, 8);
+       wait_ms(20);
        return 0;
 }
 
@@ -322,7 +337,6 @@ s8 usb_set_altinterface(struct usb_device *dev, u8 alternate)
 
 
 /******************* Bulk Transfer **********************/
-
 /**
  * Write to an a bulk endpoint.
  */
@@ -376,7 +390,6 @@ s8 usb_bulk_read(struct 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;
 }
 
@@ -385,6 +398,18 @@ s8 usb_interrupt_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeo
  */
 s8 usb_interrupt_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
 {
+       struct usb_irp *irp = (struct usb_irp*)malloc(sizeof(struct usb_irp));
+       irp->dev = dev;
+       irp->endpoint = ep; //wtf? |80; //from device to host
+       irp->epsize = dev->epSize[ep]; // ermitteln
+       irp->type = USB_INTR;
+
+       irp->buffer = buf;
+       irp->len = size;
+       irp->timeout = timeout;
+
+       usb_submit_irp(irp);
+       free(irp);
 
        return 0;
 }