#include "host.h"
#include "../usbspec/usb11spec.h"
-/* activate control_quirk (from MIKE) */
-//#define _USE_C_Q
+/* activate control_quirk */
+#define _USE_C_Q
/* macro for accessing u32 variables that need to be in little endian byte order;
*
static struct ohci_hcca hcca_oh0;
-#ifdef _USE_C_Q
-static struct endpoint_descriptor *allocate_endpoint()
-{
- struct endpoint_descriptor *ep;
- ep = (struct endpoint_descriptor *)memalign(16, sizeof(struct endpoint_descriptor));
- memset(ep, 0, sizeof(struct endpoint_descriptor));
- ep->flags = LE(OHCI_ENDPOINT_GENERAL_FORMAT);
- ep->headp = ep->tailp = ep->nexted = LE(0);
- return ep;
-}
-#endif
-
static struct general_td *allocate_general_td()
{
struct general_td *td;
return td;
}
-#ifdef _USE_C_Q
-static void control_quirk()
-{
- static struct endpoint_descriptor *ed = 0; /* empty ED */
- static struct general_td *td = 0; /* dummy TD */
- u32 head;
- u32 current;
- u32 status;
-
- /*
- * One time only.
- * Allocate and keep a special empty ED with just a dummy TD.
- */
- if (!ed) {
- ed = allocate_endpoint();
- if (!ed)
- return;
-
- td = allocate_general_td(0);
- if (!td) {
- free(ed);
- ed = NULL;
- return;
- }
-
- ed->tailp = ed->headp = LE(virt_to_phys((void*) ((u32)td & OHCI_ENDPOINT_HEAD_MASK)));
- ed->flags |= LE(OHCI_ENDPOINT_DIRECTION_OUT);
- }
-
- /*
- * The OHCI USB host controllers on the Nintendo Wii
- * video game console stop working when new TDs are
- * added to a scheduled control ED after a transfer has
- * has taken place on it.
- *
- * Before scheduling any new control TD, we make the
- * controller happy by always loading a special control ED
- * with a single dummy TD and letting the controller attempt
- * the transfer.
- * The controller won't do anything with it, as the special
- * ED has no TDs, but it will keep the controller from failing
- * on the next transfer.
- */
- head = read32(OHCI0_HC_CTRL_HEAD_ED);
- if (head) {
- printf("head: 0x%08X\n", head);
- /*
- * Load the special empty ED and tell the controller to
- * process the control list.
- */
- sync_after_write(ed, 16);
- sync_after_write(td, 16);
- write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(ed));
-
- status = read32(OHCI0_HC_CONTROL);
- set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE);
- write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF);
-
- /* spin until the controller is done with the control list */
- current = read32(OHCI0_HC_CTRL_CURRENT_ED);
- while(!current) {
- udelay(10);
- current = read32(OHCI0_HC_CTRL_CURRENT_ED);
- }
-
- printf("current: 0x%08X\n", current);
-
- /* restore the old control head and control settings */
- write32(OHCI0_HC_CONTROL, status);
- write32(OHCI0_HC_CTRL_HEAD_ED, head);
- } else {
- printf("nohead!\n");
- }
-}
-#endif
-
static void dbg_op_state()
{
}
}
+#ifdef _DU_OHCI_F_HALT
static void dbg_td_flag(u32 flag)
{
printf("**************** dbg_td_flag: 0x%08X ***************\n", flag);
printf(" R: %X\n", (flag>>18)&1);
printf("********************************************************\n");
}
+#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));
dest->flags &= LE(~OHCI_TD_DIRECTION_PID_MASK);
switch(src->pid) {
case USB_PID_SETUP:
+#ifdef _DU_OHCI_Q
printf("pid_setup\n");
+#endif
dest->flags |= LE(OHCI_TD_DIRECTION_PID_SETUP);
dest->flags |= LE(OHCI_TD_TOGGLE_0);
dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
break;
case USB_PID_OUT:
+#ifdef _DU_OHCI_Q
printf("pid_out\n");
+#endif
dest->flags |= LE(OHCI_TD_DIRECTION_PID_OUT);
dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
dest->flags |= LE(OHCI_TD_TOGGLE_1);
break;
case USB_PID_IN:
+#ifdef _DU_OHCI_Q
printf("pid_in\n");
+#endif
dest->flags |= LE(OHCI_TD_DIRECTION_PID_IN);
if(src->maxp > src->actlen) {
dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
+#ifdef _DU_OHCI_Q
printf("round buffer!\n");
+#endif
}
/*
* let the endpoint do the togglestuff!
dest->flags |= LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
}
-#ifdef _DU_OHCI_F
+#ifdef _DU_OHCI_F_HALT
static void dump_address(void *addr, u32 size, const char* str)
{
printf("%s hexdump (%d) @ 0x%08X:\n", str, size, addr);
return;
#ifdef _USE_C_Q
- required? YES! :O ... erm... or no? :/ ... in fact I have no idea
- control_quirk();
+ /* quirk... 11ms seems to be a minimum :O */
+ udelay(11000);
#endif
write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(edhead));
if((LE(edhead->headp) & OHCI_ENDPOINT_HALTED)) {
n = phys_to_virt(LE(edhead->headp)&~0xf);
prev = phys_to_virt((u32)prev);
-#ifdef _DU_OHCI_F
+#ifdef _DU_OHCI_F_HALT
printf("halted!\n");
#endif
sync_before_read((void*) n, sizeof(struct general_td));
-#ifdef _DU_OHCI_F
+#ifdef _DU_OHCI_F_HALT
printf("n: 0x%08X\n", n);
dump_address(n, sizeof(struct general_td), "n(after)");
#endif
if(n->buflen > 0) {
sync_before_read((void*) n->bufaddr, n->buflen);
-#ifdef _DU_OHCI_F
+#ifdef _DU_OHCI_F_HALT
dump_address((void*) n->bufaddr, n->buflen, "n->bufaddr(after)");
#endif
}
+#ifdef _DU_OHCI_F_HALT
dbg_td_flag(LE(n->flags));
+#endif
sync_before_read((void*) prev, sizeof(struct general_td));
-#ifdef _DU_OHCI_F
+#ifdef _DU_OHCI_F_HALT
printf("prev: 0x%08X\n", prev);
dump_address(prev, sizeof(struct general_td), "prev(after)");
#endif
if(prev->buflen >0) {
sync_before_read((void*) prev->bufaddr, prev->buflen);
-#ifdef _DU_OHCI_F
+#ifdef _DU_OHCI_F_HALT
dump_address((void*) prev->bufaddr, prev->buflen, "prev->bufaddr(after)");
#endif
}
-#ifdef _DU_OHCI_F
+#ifdef _DU_OHCI_F_HALT
dbg_td_flag(LE(prev->flags));
printf("halted end!\n");
#endif
/**
* 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
memset(edhead, 0, sizeof(struct endpoint_descriptor));
edhead->flags = LE(OHCI_ENDPOINT_GENERAL_FORMAT);
edhead->headp = edhead->tailp = edhead->nexted = LE(0);
- edhead->flags |= LE(OHCI_ENDPOINT_LOW_SPEED |
- OHCI_ENDPOINT_SET_DEVICE_ADDRESS(td->devaddress) |
+ if(td->fullspeed) {
+ edhead->flags |= LE(OHCI_ENDPOINT_FULL_SPEED);
+ } else {
+ edhead->flags |= LE(OHCI_ENDPOINT_LOW_SPEED);
+ }
+ edhead->flags |= LE(OHCI_ENDPOINT_SET_DEVICE_ADDRESS(td->devaddress) |
OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
edhead->tdcount = 0;
/**
* Remove an transfer descriptor from transfer queue.
*/
-u8 hcdi_dequeue(usb_transfer_descriptor *td) {
+u8 hcdi_dequeue(struct usb_transfer_descriptor *td) {
return 0;
}
printf("loop done\n");
#endif
- (void) usb_add_device();
+ /* returns usb_device struct */
+ (void) usb_add_device((read32(reg) & RH_PS_LSDA) >> 8);
}
}
projects / ppcskel.git / blobdiff