X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fhost%2Fohci.c;h=a04743ab6244cbeb88b9f8adce8986bb73b050c2;hb=a0af26a1b0e7f87c789f16986b3e90ba6ff1718b;hp=89f3fd22be5a5f0868f8b58ad2e9511a4abf3be2;hpb=4bdf4447cdcbb235dc4d22a9c7ec2b481df1156b;p=ppcskel.git

diff --git a/usb/host/ohci.c b/usb/host/ohci.c
index 89f3fd2..a04743a 100644
--- a/usb/host/ohci.c
+++ b/usb/host/ohci.c
@@ -43,12 +43,14 @@ 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->flags = ACCESS_LE(0);
+	// TODO !! nexttd?
 	td->nexttd = ACCESS_LE(virt_to_phys(td));
+	//td->nexttd = ACCESS_LE(0);
 	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))); //memailgn required here?
+		td->cbp = ACCESS_LE(virt_to_phys(malloc(bsize)));
 		td->be = ACCESS_LE(ACCESS_LE(td->cbp) + bsize - 1);
 	}
 	return td;
@@ -56,8 +58,8 @@ static struct general_td *allocate_general_td(size_t bsize)
 
 static void control_quirk()
 {
-	static struct endpoint_descriptor *ed; /* empty ED */
-	static struct general_td *td; /* dummy TD */
+	static struct endpoint_descriptor *ed = 0; /* empty ED */
+	static struct general_td *td = 0; /* dummy TD */
 	u32 head;
 	u32 current;
 	u32 status;
@@ -148,20 +150,37 @@ static void dbg_op_state()
 	}
 }
 
+static void dbg_td_flag(u32 flag)
+{
+	printf("**************** dbg_td_flag: 0x%08X ***************\n", flag);
+	printf("CC: %X\tshould be 0, see page 32 (ohci spec)\n", (flag>>28)&0xf);
+	printf("EC: %X\tsee page 20 (ohci spec)\n", (flag>>26)&3);
+	printf(" T: %X\n", (flag>>24)&3);
+	printf("DI: %X\n", (flag>>21)&7);
+	printf("DP: %X\n", (flag>>19)&3);
+	printf(" R: %X\n", (flag>>18)&1);
+	printf("********************************************************\n");
+}
+
+
 
 /**
  * Enqueue a transfer descriptor.
  */
-u8 first = 0;
 u8 hcdi_enqueue(usb_transfer_descriptor *td) {
-	control_quirk();
+	control_quirk(); //required? YES! :O
+
+	static struct endpoint_descriptor dummyconfig;
+	dummyconfig.flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
+	dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
 
 	printf(	"===========================\n"
 			"===========================\n");
 	sync_before_read(&hcca_oh0, 256);
 	printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
-	printf("HCCA->frame_no: %d\nhcca->hccapad1: %d\n", ((ACCESS_LE(hcca_oh0.frame_no) & 0xffff0000)>>16), ACCESS_LE(hcca_oh0.frame_no)&0xffff );
-	if(hcca_oh0.done_head) printf("WWWWWWWWOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOTTTTTTTTTTTT\n");
+	printf("HCCA->frame_no: %d\nhcca->hccapad1: %d\n",
+			((ACCESS_LE(hcca_oh0.frame_no) & 0xffff)>>16),
+			ACCESS_LE(hcca_oh0.frame_no)&0x0000ffff );
 
 	struct general_td *tmptd = allocate_general_td(td->actlen);
 	(void) memcpy((void*) (phys_to_virt(ACCESS_LE(tmptd->cbp))), td->buffer, td->actlen); 
@@ -185,28 +204,27 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 
 	printf("tmptd hexdump (before) 0x%08X:\n", tmptd);
 	hexdump(tmptd, sizeof(struct general_td));
-	printf("tmptd->cbp hexdump (before) 0x%08X:\n", 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);
 
-	sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
 	sync_after_write(tmptd, sizeof(struct general_td));
+	sync_after_write((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
 
-	struct endpoint_descriptor *dummyconfig = allocate_endpoint();
 
 #define ED_MASK2 ~0 /*((u32)~0x0f) */
 #define ED_MASK ((u32)~0x0f) 
-	dummyconfig->tailp = dummyconfig->headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK)));
+	dummyconfig.headp = ACCESS_LE(virt_to_phys((void*) ((u32)tmptd & ED_MASK)));
 
-	dummyconfig->flags |= ACCESS_LE(OHCI_ENDPOINT_LOW_SPEED | 
+	dummyconfig.flags |= ACCESS_LE(OHCI_ENDPOINT_LOW_SPEED | 
 		OHCI_ENDPOINT_SET_DEVICE_ADDRESS(td->devaddress) | 
 		OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
 		OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
 
-	printf("dummyconfig hexdump (before) 0x%08X:\n", dummyconfig);
-	hexdump((void*) dummyconfig, 16);
+	printf("dummyconfig hexdump (before) 0x%08X:\n", &dummyconfig);
+	hexdump((void*) &dummyconfig, 16);
 
-	sync_after_write(dummyconfig, 16);
-	write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(dummyconfig));
+	sync_after_write(&dummyconfig, 16);
+	write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(&dummyconfig));
 
 	printf("OHCI_CTRL_CLE: 0x%08X || ", read32(OHCI0_HC_CONTROL)&OHCI_CTRL_CLE);
 	printf("OHCI_CLF: 0x%08X\n", read32(OHCI0_HC_COMMAND_STATUS)&OHCI_CLF);
@@ -218,7 +236,7 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 	u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
 	printf("current: 0x%08X\n", current);
 	while(!current) {
-		udelay(10);
+		udelay(2);
 		current = read32(OHCI0_HC_CTRL_CURRENT_ED);
 	}
 
@@ -228,23 +246,36 @@ u8 hcdi_enqueue(usb_transfer_descriptor *td) {
 	printf("+++++++++++++++++++++++++++++\n");
 	udelay(20000);
 
-
 	sync_before_read(tmptd, sizeof(struct general_td));
 	printf("tmptd hexdump (after) 0x%08X:\n", tmptd);
 	hexdump(tmptd, sizeof(struct general_td));
+	dbg_td_flag(ACCESS_LE(tmptd->flags));
 
 	sync_before_read((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
-	printf("tmptd->cbp hexdump (after) 0x%08X:\n", tmptd->cbp);
+	printf("tmptd->cbp hexdump (after) 0x%08X:\n", phys_to_virt(ACCESS_LE(tmptd->cbp)));
 	hexdump((void*) phys_to_virt(ACCESS_LE(tmptd->cbp)), td->actlen);
 
-	sync_before_read(dummyconfig, 16);
-	printf("dummyconfig hexdump (after) 0x%08X:\n", dummyconfig);
-	hexdump((void*) dummyconfig, 16);
+	sync_before_read(&dummyconfig, 16);
+	printf("dummyconfig hexdump (after) 0x%08X:\n", &dummyconfig);
+	hexdump((void*) &dummyconfig, 16);
 
 	sync_before_read(&hcca_oh0, 256);
 	printf("done head (nach sync): 0x%08X\n", ACCESS_LE(hcca_oh0.done_head));
 
-	//free(tmptd);
+	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);
+
+	write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
+	dummyconfig.headp = dummyconfig.tailp = dummyconfig.nexted = ACCESS_LE(0);
+	//should be free'd after taking it from the done queue
+	//however, it fails?! WTF
+#if 0
+	printf("WTF1\n");
+	free(tmptd);
+	printf("WTF0\n");
+	free((void*) tmptd->cbp);
+	printf("WTF3\n");
+#endif
 	return 0;
 }
 
@@ -362,6 +393,49 @@ void hcdi_irq()
 	if (flags & OHCI_INTR_RHSC) {
 		printf("RootHubStatusChange\n");
 		/* TODO: set some next_statechange variable... */
+		u32 port1 = read32(OHCI0_HC_RH_PORT_STATUS_1);
+		u32 port2 = read32(OHCI0_HC_RH_PORT_STATUS_2);
+		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", port1);
+		printf("OHCI0_HC_RH_PORT_STATUS_2:\t0x%08X\n", port2);
+
+		if((port1 & RH_PS_CCS) && (port1 & RH_PS_CSC)) {
+			write32(OHCI0_HC_RH_PORT_STATUS_1, RH_PS_CSC);
+
+			wait_ms(100);
+
+			/* clear CSC flag, set PES and start port reset (PRS) */
+			write32(OHCI0_HC_RH_PORT_STATUS_1, RH_PS_PES);
+			write32(OHCI0_HC_RH_PORT_STATUS_1, RH_PS_PRS);
+
+			/* spin until port reset is complete */
+			port1 = read32(OHCI0_HC_RH_PORT_STATUS_1);
+			while(!(port1 & RH_PS_PRSC)) {
+				udelay(2);
+				printf("fuck");
+				port1 = read32(OHCI0_HC_RH_PORT_STATUS_1);
+			}
+
+			(void) usb_add_device();
+		}
+		if((port2 & RH_PS_CCS) && (port2 & RH_PS_CSC)) {
+			wait_ms(100);
+
+			/* clear CSC flag, set PES and start port reset (PRS) */
+			write32(OHCI0_HC_RH_PORT_STATUS_2, port2 | RH_PS_CSC | RH_PS_PES | RH_PS_PRS); 
+
+			/* spin until port reset is complete */
+			port2 = read32(OHCI0_HC_RH_PORT_STATUS_2);
+			while(!(port2 & RH_PS_PRSC)) {
+				udelay(2);
+				port2 = read32(OHCI0_HC_RH_PORT_STATUS_2);
+			}
+
+			(void) usb_add_device();
+		}
+
 		write32(OHCI0_HC_INT_STATUS, OHCI_INTR_RD | OHCI_INTR_RHSC);
 	}
 	/* ResumeDetected */
@@ -374,7 +448,17 @@ void hcdi_irq()
 	/* WritebackDoneHead */
 	if (flags & OHCI_INTR_WDH) {
 		printf("WritebackDoneHead\n");
-		/* TODO: figure out what the linux kernel does here... */
+		/* basically the linux irq handler reverse TDs to their urbs
+		 * and set done_head to null.
+		 * since we are polling atm, just should do the latter task.
+		 * however, this won't work for now (i don't know why...)
+		 * TODO!
+		 */
+#if 0
+		sync_before_read(&hcca_oh0, 256);
+		hcca_oh0.done_head = 0;
+		sync_after_write(&hcca_oh0, 256);
+#endif
 	}
 
 	/* TODO: handle any pending URB/ED unlinks... */