projects
/
ppcskel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some usb stack related clean up; BULK still untested
[ppcskel.git]
/
usb
/
core
/
usb.c
diff --git
a/usb/core/usb.c
b/usb/core/usb.c
index c0ff3fb1820b863cfa19be899a824045b157516f..45ceba2ea51a4175010c4c774c858227717dec12 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.
*/
* 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"
#include "usb.h"
#include "core.h"
#include "../host/host.h"
@@
-101,19
+112,20
@@
s8 usb_reset(struct usb_device *dev)
/******************* Control Transfer **********************/
/******************* Control Transfer **********************/
-
/**
* Create a control transfer.
*/
s8 usb_control_msg(struct usb_device *dev, u8 requesttype, u8 request,
u16 value, u16 index, u16 length, u8 *buf, u16 timeout)
{
/**
* Create a control transfer.
*/
s8 usb_control_msg(struct usb_device *dev, u8 requesttype, u8 request,
u16 value, u16 index, u16 length, u8 *buf, u16 timeout)
{
- 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;
+ static struct usb_irp irp;
+ memset(&irp, 0, sizeof(struct usb_irp));
+
+ irp.dev = dev;
+ irp.endpoint = 0;
+
+ irp.epsize = dev->bMaxPacketSize0;
+ irp.type = USB_CTRL;
buf[0]=(u8)requesttype;
buf[1]=(u8)request;
buf[0]=(u8)requesttype;
buf[1]=(u8)request;
@@
-124,12
+136,11
@@
s8 usb_control_msg(struct usb_device *dev, u8 requesttype, u8 request,
buf[6]=(u8)(length);
buf[7]=(u8)(length >> 8);
buf[6]=(u8)(length);
buf[7]=(u8)(length >> 8);
- irp
->
buffer = buf;
- irp
->
len = length;
- irp
->
timeout = timeout;
+ irp
.
buffer = buf;
+ irp
.
len = length;
+ irp
.
timeout = timeout;
- usb_submit_irp(irp);
- free(irp);
+ usb_submit_irp(&irp);
return 0;
}
return 0;
}
@@
-293,6
+304,7
@@
s8 usb_set_address(struct usb_device *dev, u8 address)
{
cleargbuf();
usb_control_msg(dev, 0x00, SET_ADDRESS, address, 0, 0, gbuf, 0);
{
cleargbuf();
usb_control_msg(dev, 0x00, SET_ADDRESS, address, 0, 0, gbuf, 0);
+ wait_ms(210);
return 0;
}
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");
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];
}
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);
{
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;
}
return 0;
}
@@
-319,31
+334,30
@@
s8 usb_set_altinterface(struct usb_device *dev, u8 alternate)
return 0;
}
return 0;
}
+static s8 usb_gen_rw(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout, u8 type) {
+ static struct usb_irp irp;
+ memset(&irp, 0, sizeof(struct usb_irp));
+ irp.dev = dev;
+ irp.endpoint = ep;
+ irp.epsize = dev->epSize[ep & 0x7F];
+ irp.type = type;
-/******************* Bulk Transfer **********************/
+ irp.buffer = buf;
+ irp.len = size;
+ irp.timeout = timeout;
+
+ usb_submit_irp(&irp);
+ return 0;
+}
+/******************* Bulk Transfer **********************/
/**
* Write to an a bulk endpoint.
*/
s8 usb_bulk_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
{
/**
* Write to an a bulk endpoint.
*/
s8 usb_bulk_write(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->devaddress = dev->address;
-
- irp->endpoint = ep;
- irp->epsize = dev->epSize[ep]; // ermitteln
- irp->type = USB_BULK;
-
- irp->buffer = buf;
- irp->len = size;
- irp->timeout = timeout;
-
- usb_submit_irp(irp);
- free(irp);
-
- return 0;
+ return usb_gen_rw(dev, ep, buf, size, timeout, USB_BULK);
}
/**
}
/**
@@
-351,22
+365,7
@@
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)
{
*/
s8 usb_bulk_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->devaddress = dev->address;
- irp->dev = dev;
-
- irp->endpoint = ep | 0x80; // from device to host
- irp->epsize = dev->epSize[ep]; // ermitteln
- irp->type = USB_BULK;
-
- irp->buffer = buf;
- irp->len = size;
- irp->timeout = timeout;
-
- usb_submit_irp(irp);
- free(irp);
-
- return 0;
+ return usb_gen_rw(dev, ep|0x80, buf, size, timeout, USB_BULK);
}
}
@@
-376,8
+375,7
@@
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)
{
*/
s8 usb_interrupt_write(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
{
-
- return 0;
+ return usb_gen_rw(dev, ep, buf, size, timeout, USB_INTR);
}
/**
}
/**
@@
-385,8
+383,7
@@
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)
{
*/
s8 usb_interrupt_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout)
{
-
- return 0;
+ return usb_gen_rw(dev, ep|0x80, buf, size, timeout, USB_INTR);
}
}
@@
-411,5
+408,3
@@
s8 usb_isochron_read(struct usb_device *dev, u8 ep, u8 *buf, u8 size, u8 timeout
return 0;
}
return 0;
}
-
-//#endif //_USB_H_