(((dword) & 0x000000FF) << 24) )
static struct general_td *allocate_general_td();
-static void dbg_op_state();
-static void configure_ports(u8 from_init);
-static void setup_port(u32 reg, u8 from_init);
+static void dbg_op_state(u32 reg);
+static void configure_ports(u8 from_init, u32 reg);
+static struct usb_device *setup_port(u32 ohci, u32 reg, u8 pport, u8 from_init);
+static void set_target_hcca(u32 reg);
static struct ohci_hcca hcca_oh0;
-
+static struct ohci_hcca hcca_oh1;
+struct ohci_hcca *hcca;
static struct general_td *allocate_general_td()
{
}
-static void dbg_op_state()
+static void dbg_op_state(u32 reg)
{
- switch (read32(OHCI0_HC_CONTROL) & OHCI_CTRL_HCFS) {
+ switch (read32(reg+OHCI_HC_CONTROL) & OHCI_CTRL_HCFS) {
case OHCI_USB_SUSPEND:
printf("ohci-- OHCI_USB_SUSPEND\n");
break;
dest->flags |= LE(OHCI_TD_DIRECTION_PID_OUT);
dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
- /*
- * TODO: just temporary solution! (consider it with len?)
- * there can be also regular PID_OUT pakets
- */
- dest->flags |= LE(OHCI_TD_TOGGLE_1);
+ dest->flags |= src->togl ? LE(OHCI_TD_TOGGLE_1) : LE(OHCI_TD_TOGGLE_0);
break;
case USB_PID_IN:
#ifdef _DU_OHCI_Q
printf("round buffer!\n");
#endif
}
- /*
- * let the endpoint do the togglestuff!
- * TODO: just temporary solution!
- * there can be also inregular PID_IN pakets (@Status Stage)
- */
- dest->flags |= LE(OHCI_TD_TOGGLE_CARRY);
+ dest->flags |= src->togl ? LE(OHCI_TD_TOGGLE_1) : LE(OHCI_TD_TOGGLE_0);
break;
}
dest->flags |= LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
static struct endpoint_descriptor _edhead;
struct endpoint_descriptor *edhead = 0;
-void hcdi_fire()
+void hcdi_fire(u32 reg)
{
#ifdef _DU_OHCI_F
printf("<^> <^> <^> hcdi_fire(start)\n");
if(edhead == 0)
return;
+ u8 itmp;
+ switch(edhead->type) {
+ case USB_CTRL:
#ifdef _USE_C_Q
- /* quirk... 11ms seems to be a minimum :O */
- udelay(11000);
-#endif
+ /* quirk... 11ms seems to be a minimum :O */
+ udelay(11000);
+#endif
+ write32(reg+OHCI_HC_CTRL_HEAD_ED, virt_to_phys(edhead));
+ break;
+
+ case USB_INTR:
+ //udelay(11000);
+ set_target_hcca(reg);
+ sync_before_read(hcca, sizeof(struct ohci_hcca));
+ for(itmp = 0; itmp < NUM_INITS; itmp++) {
+ hcca->int_table[itmp] = LE(virt_to_phys(edhead));
+ }
+ sync_after_write(hcca, sizeof(struct ohci_hcca));
+ break;
- write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(edhead));
+ case USB_BULK:
+ write32(reg+OHCI_HC_BULK_HEAD_ED, virt_to_phys(edhead));
+ break;
+
+ case USB_ISOC:
+ break;
+ }
/* sync it all */
sync_after_write(edhead, sizeof(struct endpoint_descriptor));
x = phys_to_virt(LE(x->nexttd));
}
- /* trigger control list */
- set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE);
- write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF);
+ /* start transfer */
+ switch(edhead->type) {
+ case USB_CTRL:
+ /* trigger control list */
+ set32(reg+OHCI_HC_CONTROL, OHCI_CTRL_CLE);
+ write32(reg+OHCI_HC_COMMAND_STATUS, OHCI_CLF);
+ break;
+
+ case USB_INTR:
+ /* trigger periodic list */
+ set32(reg+OHCI_HC_CONTROL, OHCI_CTRL_PLE);
+ break;
+
+ case USB_BULK:
+ /* trigger bulk list */
+ set32(reg+OHCI_HC_CONTROL, OHCI_CTRL_BLE);
+ write32(reg+OHCI_HC_COMMAND_STATUS, OHCI_BLF);
+ break;
+
+ case USB_ISOC:
+ break;
+ }
struct general_td *n=0, *prev = 0, *next = 0;
/* poll until edhead->headp is null */
sync_before_read(edhead, sizeof(struct endpoint_descriptor));
#ifdef _DU_OHCI_F
printf("edhead->headp: 0x%08X\n", LE(edhead->headp));
- udelay(10000);
#endif
/* if halted, debug output plz. will break the transfer */
dbg_td_flag(LE(prev->flags));
printf("halted end!\n");
#endif
- return;
+ goto out;
}
prev = (struct general_td*) (LE(edhead->headp)&~0xf);
} while(LE(edhead->headp)&~0xf);
- n = phys_to_virt(read32(OHCI0_HC_DONE_HEAD) & ~1);
+ n = phys_to_virt(read32(reg+OHCI_HC_DONE_HEAD) & ~1);
#ifdef _DU_OHCI_F
- printf("hc_done_head: 0x%08X\n", read32(OHCI0_HC_DONE_HEAD));
+ printf("hc_done_head: 0x%08X\n", read32(reg+OHCI_HC_DONE_HEAD));
#endif
prev = 0; next = 0;
free(prev);
}
- hcca_oh0.done_head = 0;
- sync_after_write(&hcca_oh0, sizeof(hcca_oh0));
+out:
+ set_target_hcca(reg);
+ sync_before_read(hcca, sizeof(struct ohci_hcca));
+
+ u8 jtmp;
+ switch(edhead->type) {
+ case USB_CTRL:
+ write32(reg+OHCI_HC_CONTROL, read32(reg+OHCI_HC_CONTROL)&~OHCI_CTRL_CLE);
+ break;
+
+ case USB_INTR:
+ write32(reg+OHCI_HC_CONTROL, read32(reg+OHCI_HC_CONTROL)&~OHCI_CTRL_PLE);
+ for(jtmp = 0; jtmp < NUM_INITS; jtmp++) {
+ hcca->int_table[jtmp] = 0;
+ }
+ break;
+
+ case USB_BULK:
+ write32(reg+OHCI_HC_CONTROL, read32(reg+OHCI_HC_CONTROL)&~OHCI_CTRL_BLE);
+ break;
- write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
+ case USB_ISOC:
+ break;
+ }
+
+ hcca->done_head = 0;
+ sync_after_write(hcca, sizeof(struct ohci_hcca));
edhead = 0;
/**
* Enqueue a transfer descriptor.
*/
-u8 hcdi_enqueue(const struct usb_transfer_descriptor *td) {
+u8 hcdi_enqueue(const struct usb_transfer_descriptor *td, u32 reg) {
#ifdef _DU_OHCI_Q
printf("*()*()*()*()*()*()*() hcdi_enqueue(start)\n");
#endif
OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
edhead->tdcount = 0;
+ edhead->type = td->type;
}
struct general_td *tdhw = allocate_general_td();
/**
* Remove an transfer descriptor from transfer queue.
*/
-u8 hcdi_dequeue(struct usb_transfer_descriptor *td) {
+u8 hcdi_dequeue(struct usb_transfer_descriptor *td, u32 reg) {
return 0;
}
-void hcdi_init()
+void hcdi_init(u32 reg)
{
printf("ohci-- init\n");
- dbg_op_state();
+ dbg_op_state(reg);
/* disable hc interrupts */
- set32(OHCI0_HC_INT_DISABLE, OHCI_INTR_MIE);
+ set32(reg+OHCI_HC_INT_DISABLE, OHCI_INTR_MIE);
/* save fmInterval and calculate FSMPS */
#define FSMP(fi) (0x7fff & ((6 * ((fi) - 210)) / 7))
#define FI 0x2edf /* 12000 bits per frame (-1) */
- u32 fmint = read32(OHCI0_HC_FM_INTERVAL) & 0x3fff;
+ u32 fmint = read32(reg+OHCI_HC_FM_INTERVAL) & 0x3fff;
if(fmint != FI)
printf("ohci-- fminterval delta: %d\n", fmint - FI);
fmint |= FSMP (fmint) << 16;
set32(EHCI_CTL, EHCI_CTL_OH0INTE | EHCI_CTL_OH1INTE | 0xe0000);
/* reset HC */
- write32(OHCI0_HC_COMMAND_STATUS, OHCI_HCR);
+ write32(reg+OHCI_HC_COMMAND_STATUS, OHCI_HCR);
/* wait max. 30us */
u32 ts = 30;
- while ((read32(OHCI0_HC_COMMAND_STATUS) & OHCI_HCR) != 0) {
+ while ((read32(reg+OHCI_HC_COMMAND_STATUS) & OHCI_HCR) != 0) {
if(--ts == 0) {
printf("ohci-- FAILED");
return;
/* Tell the controller where the control and bulk lists are
* The lists are empty now. */
- write32(OHCI0_HC_CTRL_HEAD_ED, 0);
- write32(OHCI0_HC_BULK_HEAD_ED, 0);
+ write32(reg+OHCI_HC_CTRL_HEAD_ED, 0);
+ write32(reg+OHCI_HC_BULK_HEAD_ED, 0);
/* set hcca adress */
- sync_after_write(&hcca_oh0, 256);
- write32(OHCI0_HC_HCCA, virt_to_phys(&hcca_oh0));
+ set_target_hcca(reg);
+ sync_after_write(hcca, 256);
+ write32(reg+OHCI_HC_HCCA, virt_to_phys(hcca));
/* set periodicstart */
#define FIT (1<<31)
- u32 fmInterval = read32(OHCI0_HC_FM_INTERVAL) &0x3fff;
- u32 fit = read32(OHCI0_HC_FM_INTERVAL) & FIT;
+ u32 fmInterval = read32(reg+OHCI_HC_FM_INTERVAL) &0x3fff;
+ u32 fit = read32(reg+OHCI_HC_FM_INTERVAL) & FIT;
- write32(OHCI0_HC_FM_INTERVAL, fmint | (fit ^ FIT));
- write32(OHCI0_HC_PERIODIC_START, ((9*fmInterval)/10)&0x3fff);
+ write32(reg+OHCI_HC_FM_INTERVAL, fmint | (fit ^ FIT));
+ write32(reg+OHCI_HC_PERIODIC_START, ((9*fmInterval)/10)&0x3fff);
/* testing bla */
- if ((read32(OHCI0_HC_FM_INTERVAL) & 0x3fff0000) == 0 || !read32(OHCI0_HC_PERIODIC_START)) {
+ if ((read32(reg+OHCI_HC_FM_INTERVAL) & 0x3fff0000) == 0 || !read32(reg+OHCI_HC_PERIODIC_START)) {
printf("ohci-- w00t, fail!! see ohci-hcd.c:669\n");
}
/* start HC operations */
- write32(OHCI0_HC_CONTROL, OHCI_CONTROL_INIT | OHCI_USB_OPER);
+ write32(reg+OHCI_HC_CONTROL, OHCI_CONTROL_INIT | OHCI_USB_OPER);
/* wake on ConnectStatusChange, matching external hubs */
- write32(OHCI0_HC_RH_STATUS, /*RH_HS_DRWE |*/ RH_HS_LPSC);
+ write32(reg+OHCI_HC_RH_STATUS, /*RH_HS_DRWE |*/ RH_HS_LPSC);
/* Choose the interrupts we care about now, others later on demand */
- write32(OHCI0_HC_INT_STATUS, ~0);
- write32(OHCI0_HC_INT_ENABLE, OHCI_INTR_INIT);
+ write32(reg+OHCI_HC_INT_STATUS, ~0);
+ write32(reg+OHCI_HC_INT_ENABLE, OHCI_INTR_INIT);
//wtf?
- wait_ms ((read32(OHCI0_HC_RH_DESCRIPTOR_A) >> 23) & 0x1fe);
+ wait_ms ((read32(reg+OHCI_HC_RH_DESCRIPTOR_A) >> 23) & 0x1fe);
- configure_ports((u8)1);
+ configure_ports((u8)1, reg);
irq_restore(cookie);
- dbg_op_state();
+ dbg_op_state(reg);
}
-static void configure_ports(u8 from_init)
+static struct usb_device *connected[2] = {NULL, NULL};
+static void configure_ports(u8 from_init, u32 reg)
{
#ifdef _DU_OHCI_RH
- printf("OHCI0_HC_RH_DESCRIPTOR_A:\t0x%08X\n", read32(OHCI0_HC_RH_DESCRIPTOR_A));
- printf("OHCI0_HC_RH_DESCRIPTOR_B:\t0x%08X\n", read32(OHCI0_HC_RH_DESCRIPTOR_B));
- printf("OHCI0_HC_RH_STATUS:\t\t0x%08X\n", read32(OHCI0_HC_RH_STATUS));
- printf("OHCI0_HC_RH_PORT_STATUS_1:\t0x%08X\n", read32(OHCI0_HC_RH_PORT_STATUS_1));
- printf("OHCI0_HC_RH_PORT_STATUS_2:\t0x%08X\n", read32(OHCI0_HC_RH_PORT_STATUS_2));
-#endif
+ printf("=== Roothub @ %s ===\n", reg == OHCI0_REG_BASE ? "OHCI0" : "OHCI1");
+ printf("OHCI_HC_RH_DESCRIPTOR_A:\t0x%08X\n", read32(reg+OHCI_HC_RH_DESCRIPTOR_A));
+ printf("OHCI_HC_RH_DESCRIPTOR_B:\t0x%08X\n", read32(reg+OHCI_HC_RH_DESCRIPTOR_B));
+ printf("OHCI_HC_RH_STATUS:\t\t0x%08X\n", read32(reg+OHCI_HC_RH_STATUS));
+ printf("OHCI_HC_RH_PORT_STATUS_1:\t0x%08X\n", read32(reg+OHCI_HC_RH_PORT_STATUS_1));
+ printf("OHCI_HC_RH_PORT_STATUS_2:\t0x%08X\n", read32(reg+OHCI_HC_RH_PORT_STATUS_2));
+#endif
+
+ struct usb_device *dtmp;
+ if(!(dtmp = setup_port(reg, reg+OHCI_HC_RH_PORT_STATUS_1, 0, from_init))) {
+ if(connected[0]) {
+ usb_remove_device(connected[0]);
+ connected[0] = NULL;
+ }
+ } else {
+ connected[0] = dtmp;
+ }
+
+ if(!(dtmp = setup_port(reg, reg+OHCI_HC_RH_PORT_STATUS_2, 1, from_init))) {
+ if(connected[1]) {
+ usb_remove_device(connected[1]);
+ connected[1] = NULL;
+ }
+ } else {
+ connected[1] = dtmp;
+ }
- setup_port(OHCI0_HC_RH_PORT_STATUS_1, from_init);
- setup_port(OHCI0_HC_RH_PORT_STATUS_2, from_init);
#ifdef _DU_OHCI_RH
printf("configure_ports done\n");
#endif
}
-static void setup_port(u32 reg, u8 from_init)
+static struct usb_device *setup_port(u32 ohci, u32 reg, u8 pport, u8 from_init)
{
u32 port = read32(reg);
if((port & RH_PS_CCS) && ((port & RH_PS_CSC) || from_init)) {
#ifdef _DU_OHCI_RH
printf("fu\n");
#endif
- return;
+ return NULL;
}
write32(reg, RH_PS_PRS);
#endif
/* returns usb_device struct */
- (void) usb_add_device((read32(reg) & RH_PS_LSDA) >> 8);
+ return usb_add_device((read32(reg) & RH_PS_LSDA) >> 8, ohci);
+ }
+ if(port & RH_PS_CCS) {
+ return connected[pport];
}
+ return NULL;
}
-void hcdi_irq()
+void hcdi_irq(u32 reg)
{
/* read interrupt status */
- u32 flags = read32(OHCI0_HC_INT_STATUS);
+ u32 flags = read32(reg+OHCI_HC_INT_STATUS);
/* when all bits are set to 1 some problem occured */
if (flags == 0xffffffff) {
}
/* only care about interrupts that are enabled */
- flags &= read32(OHCI0_HC_INT_ENABLE);
+ flags &= read32(reg+OHCI_HC_INT_ENABLE);
/* nothing to do? */
if (flags == 0) {
if (flags & OHCI_INTR_RHSC) {
printf("RootHubStatusChange\n");
/* TODO: set some next_statechange variable... */
- configure_ports(0);
- write32(OHCI0_HC_INT_STATUS, OHCI_INTR_RD | OHCI_INTR_RHSC);
+ configure_ports(0, reg);
+ write32(reg+OHCI_HC_INT_STATUS, OHCI_INTR_RD | OHCI_INTR_RHSC);
}
/* ResumeDetected */
else if (flags & OHCI_INTR_RD) {
printf("ResumeDetected\n");
- write32(OHCI0_HC_INT_STATUS, OHCI_INTR_RD);
+ write32(reg+OHCI_HC_INT_STATUS, OHCI_INTR_RD);
/* TODO: figure out what the linux kernel does here... */
}
#define HC_IS_RUNNING() 1 /* dirty, i know... just a temporary solution */
if (HC_IS_RUNNING()) {
- write32(OHCI0_HC_INT_STATUS, flags);
- write32(OHCI0_HC_INT_ENABLE, OHCI_INTR_MIE);
+ write32(reg+OHCI_HC_INT_STATUS, flags);
+ write32(reg+OHCI_HC_INT_ENABLE, OHCI_INTR_MIE);
+ }
+}
+
+/* Before you access the HCCA structure in any way, call this to set the pointer correctly! */
+static void set_target_hcca(u32 reg)
+{
+ switch(reg) {
+ case OHCI0_REG_BASE: hcca = &hcca_oh0; break;
+ case OHCI1_REG_BASE: hcca = &hcca_oh1; break;
}
}
-void show_frame_no()
+void show_frame_no(u32 reg)
{
- sync_before_read(&hcca_oh0, 256);
- printf("***** frame_no: %d *****\n", LE(hcca_oh0.frame_no));
+ set_target_hcca(reg);
+ sync_before_read(hcca, 256);
+ printf("***** frame_no: %d *****\n", LE(hcca->frame_no));
}