still buggy.
bulk transfers also added, but UNTESTED!
usb_init(OHCI0_REG_BASE);
/* internal ohci */
usb_init(OHCI0_REG_BASE);
/* internal ohci */
- usb_init(OHCI1_REG_BASE);
+ //usb_init(OHCI1_REG_BASE);
/* load HID keyboard driver */
usb_hidkb_init();
/* load HID keyboard driver */
usb_hidkb_init();
}
while(!usb_hidkb_inuse());
}
while(!usb_hidkb_inuse());
+ print_str("hello keyboard :)", 17);
+
#define FONT_WIDTH 13
#define FONT_HEIGHT 15
#define STDOUT_BORDER_LEFT 20
#define FONT_WIDTH 13
#define FONT_HEIGHT 15
#define STDOUT_BORDER_LEFT 20
#ifdef WTF
volatile u8 wzf = 11;
if(0 == wzf) {
#ifdef WTF
volatile u8 wzf = 11;
if(0 == wzf) {
+ u8 itmp;
+ switch(edhead->type) {
+ case USB_CTRL:
- /* 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(reg+OHCI_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));
/* sync it all */
sync_after_write(edhead, sizeof(struct endpoint_descriptor));
x = phys_to_virt(LE(x->nexttd));
}
x = phys_to_virt(LE(x->nexttd));
}
- /* trigger control list */
- set32(reg+OHCI_HC_CONTROL, OHCI_CTRL_CLE);
- write32(reg+OHCI_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 */
struct general_td *n=0, *prev = 0, *next = 0;
/* poll until edhead->headp is null */
- hcca->done_head = 0;
- sync_after_write(hcca, sizeof(*hcca));
+ sync_before_read(hcca, sizeof(struct ohci_hcca));
-out:
- write32(reg+OHCI_HC_CONTROL, read32(reg+OHCI_HC_CONTROL)&~OHCI_CTRL_CLE);
+ 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;
+
+ case USB_ISOC:
+ break;
+ }
+
+ hcca->done_head = 0;
+ sync_after_write(hcca, sizeof(struct ohci_hcca));
OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
edhead->tdcount = 0;
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();
}
struct general_td *tdhw = allocate_general_td();
/* required by software */
u32 tdcount;
/* required by software */
u32 tdcount;
} ALIGNED(16);
#define OHCI_ENDPOINT_ADDRESS_MASK 0x0000007f
} ALIGNED(16);
#define OHCI_ENDPOINT_ADDRESS_MASK 0x0000007f