X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fhost%2Fohci.c;h=bf1bc6233a9c56bc6099e169f6d323fc5a2bb9cb;hb=cd1b84d4092de6a949c90724686a5cd05e47504d;hp=69f27e9189ba01c397e694c7636a1e70c91940c3;hpb=e2f68eaaefb3045cd6e3d07a326ac7feeeda7bac;p=ppcskel.git

diff --git a/usb/host/ohci.c b/usb/host/ohci.c
index 69f27e9..bf1bc62 100644
--- a/usb/host/ohci.c
+++ b/usb/host/ohci.c
@@ -40,8 +40,7 @@ static struct ohci_hcca hcca_oh0;
 static struct endpoint_descriptor *allocate_endpoint()
 {
 	struct endpoint_descriptor *ep;
-	//memalign instead of calloc doesn't work here?! WTF
-	ep = (struct endpoint_descriptor *)memalign(sizeof(struct endpoint_descriptor), 16);
+	ep = (struct endpoint_descriptor *)memalign(16, sizeof(struct endpoint_descriptor));
 	ep->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
 	ep->headp = ep->tailp = ep->nexted = ACCESS_LE(0);
 	return ep;
@@ -50,7 +49,7 @@ static struct endpoint_descriptor *allocate_endpoint()
 static struct general_td *allocate_general_td(size_t bsize)
 {
 	struct general_td *td;
-	td = (struct general_td *)memalign(sizeof(struct general_td), 16);
+	td = (struct general_td *)memalign(16, sizeof(struct general_td));
 	td->flags = ACCESS_LE(0);
 	// TODO !! nexttd?
 	td->nexttd = ACCESS_LE(virt_to_phys(td));
@@ -58,8 +57,10 @@ static struct general_td *allocate_general_td(size_t bsize)
 	if(bsize == 0) {
 		td->cbp = td->be = ACCESS_LE(0);
 	} else {
-		td->cbp = ACCESS_LE(virt_to_phys(memalign(bsize, 16))); //memailgn required here?
-		//td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize)));
+		//td->cbp = ACCESS_LE(virt_to_phys(memalign(16, bsize))); //memailgn required here?
+		//align it to 4kb? :O
+		td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize)));
+		memset(phys_to_virt(ACCESS_LE(td->cbp)), 0, bsize);
 		td->be = ACCESS_LE(ACCESS_LE(td->cbp) + bsize - 1);
 	}
 	return td;
@@ -177,10 +178,11 @@ static void dbg_td_flag(u32 flag)
  * Enqueue a transfer descriptor.
  */
 u8 hcdi_enqueue(usb_transfer_descriptor *td) {
-	control_quirk(); //required? YES! :O
+	control_quirk(); //required? YES! :O ... erm... or no? :/
 	u32 tmptdbuffer;
 
 	static struct endpoint_descriptor dummyconfig;
+	memset(&dummyconfig, 0, 16);
 	dummyconfig.flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
 	dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
 
@@ -199,23 +201,27 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 	switch(td->pid) {
 		case USB_PID_SETUP:
 			printf("pid_setup\n");
-			tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP);
+			tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP | 
+					OHCI_TD_TOGGLE_0 | 
+					OHCI_TD_BUFFER_ROUNDING);
 			break;
 		case USB_PID_OUT:
 			printf("pid_out\n");
 			tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_OUT);
+			tmptd->flags |= ACCESS_LE(((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0));
 			break;
 		case USB_PID_IN:
 			printf("pid_in\n");
 			tmptd->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN);
+			tmptd->flags |= ACCESS_LE(((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0));
 			break;
 	}
-	tmptd->flags |= ACCESS_LE((td->togl) ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0);
+	tmptd->flags |= ACCESS_LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
 
 	printf("tmptd hexdump (before) 0x%08X:\n", tmptd);
 	hexdump(tmptd, sizeof(struct general_td));
 	//save buffer adress here; HC may change tmptd->cbp
-	tmptdbuffer = phys_to_virt(ACCESS_LE(tmptd->cbp)); 
+	tmptdbuffer = (u32) phys_to_virt(ACCESS_LE(tmptd->cbp)); 
 	printf("tmptd->cbp hexdump (before) 0x%08X:\n", phys_to_virt(ACCESS_LE(tmptd->cbp)));
 	hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
 
@@ -241,21 +247,18 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 	set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE);
 	write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF);
 
-	printf("+++++++++++++++++++++++++++++\n");
+	//printf("+++++++++++++++++++++++++++++\n");
 	/* spin until the controller is done with the control list */
-	u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
-	printf("current: 0x%08X\n", current);
+	//printf("current: 0x%08X\n", current);
 
 	//don't use this quirk stuff here!
-#if 0
-	while(!current) {
-		udelay(2);
-		current = read32(OHCI0_HC_CTRL_CURRENT_ED);
+#if 1
+	while(!read32(OHCI0_HC_CTRL_CURRENT_ED)) {
 	}
 #endif
 
 	udelay(20000);
-	current = read32(OHCI0_HC_CTRL_CURRENT_ED);
+	u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
 	printf("current: 0x%08X\n", current);
 	printf("+++++++++++++++++++++++++++++\n");
 	udelay(20000);
@@ -281,12 +284,25 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 	printf("done head hexdump: 0x%08X\n", donetd);
 	hexdump((void*) donetd, 16);
 
-	sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-	(void) memcpy((void*) (td->buffer), phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+	u32 newlen = 0;
+	if(td->actlen) {
+		sync_before_read((void*) tmptdbuffer, td->actlen);
+		newlen = (u32)phys_to_virt(ACCESS_LE(tmptd->cbp)) - tmptdbuffer;
+		printf("WOOOOT newlen: %d\n", newlen);
+		hexdump((void*) tmptdbuffer, newlen);
+		printf("OLD length: %d\n", td->actlen);
+		hexdump((void*) tmptdbuffer, td->actlen);
+	}
+
+	sync_before_read((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))-newlen), td->actlen);
+	printf("td->buffer: 0x%08X\np2v(A_L(tmptd->cbp: 0x%08X\ntd->actlen: %d\n", (void*) (td->buffer), phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
+	(void) memcpy((void*) (td->buffer), (void*) tmptdbuffer, td->actlen);
 
 	write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
 	dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
 
+	write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(0));
+
 
 	/* 
 	 * TD should be free'd after taking it from the done queue.
@@ -294,9 +310,11 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 	 */
 
 	/* only when a buffer is allocated */
+#if 0
 	if(td->actlen)
 		free((void*)tmptdbuffer);
 	free(tmptd);
+#endif
 	return 0;
 }
 
@@ -405,7 +423,7 @@ static void setup_port(u32 reg, u8 from_init)
 	if((port & RH_PS_CCS) && ((port & RH_PS_CSC) || from_init)) {
 		write32(reg, RH_PS_CSC);
 
-		wait_ms(150);
+		wait_ms(120);
 
 		/* clear CSC flag, set PES and start port reset (PRS) */
 		write32(reg, RH_PS_PES);
@@ -420,6 +438,8 @@ static void setup_port(u32 reg, u8 from_init)
 		while(!(read32(reg) & RH_PS_PRSC)); // hint: it may stuck here
 		printf("loop done\n");
 
+		wait_ms(20);
+
 		(void) usb_add_device();
 	}
 }
@@ -491,3 +511,8 @@ void hcdi_irq()
 	}
 }
 
+void show_frame_no()
+{
+	sync_before_read(&hcca_oh0, 256);
+	printf("***** frame_no: %d *****\n", ACCESS_LE(hcca_oh0.frame_no));
+}