X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=usb%2Fhost%2Fohci.c;h=3e0e78ba52a197d32f70699e21a013fa06f10fd1;hb=5e163d7220489d291e636d1f77bf0ef0ee52b125;hp=71062f8c8b46405217803b24b37f1338e781b9d2;hpb=400f69bd051161b5d293adaf2db9a28584b15231;p=ppcskel.git

diff --git a/usb/host/ohci.c b/usb/host/ohci.c
index 71062f8..3e0e78b 100644
--- a/usb/host/ohci.c
+++ b/usb/host/ohci.c
@@ -18,54 +18,51 @@ Copyright (C) 2009     Sebastian Falbesoner <sebastian.falbesoner@gmail.com>
 #include "host.h"
 #include "../usbspec/usb11spec.h"
 
-// macro for accessing u32 variables that need to be in little endian byte order;
-// whenever you read or write from an u32 field that the ohci host controller
-// will read or write from too, use this macro for access!
-#define ACCESS_LE(dword) (u32)( (((dword) & 0xFF000000) >> 24) | \
+/* activate control_quirk (from MIKE) */
+//#define _USE_C_Q
+
+/* macro for accessing u32 variables that need to be in little endian byte order;
+ *
+ * whenever you read or write from an u32 field that the ohci host controller
+ * will read or write from too, use this macro for access!
+ */
+#define LE(dword) (u32)( (((dword) & 0xFF000000) >> 24) | \
 			   (((dword) & 0x00FF0000) >> 8)  | \
 			   (((dword) & 0x0000FF00) << 8)  | \
 			   (((dword) & 0x000000FF) << 24) )
 
-static struct endpoint_descriptor *allocate_endpoint();
-static struct general_td *allocate_general_td(size_t);
-static void control_quirk();
+static struct general_td *allocate_general_td();
 static void dbg_op_state();
-static void dbg_td_flag(u32 flag);
 static void configure_ports(u8 from_init);
 static void setup_port(u32 reg, u8 from_init);
 
 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));
-	ep->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
-	ep->headp = ep->tailp = ep->nexted = ACCESS_LE(0);
+	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(size_t bsize)
+static struct general_td *allocate_general_td()
 {
 	struct general_td *td;
 	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));
-	td->nexttd = ACCESS_LE(0);
-	if(bsize == 0) {
-		td->cbp = td->be = ACCESS_LE(0);
-	} else {
-		//align it to 4kb? :O
-		//td->cbp = ACCESS_LE(virt_to_phys(memalign(4096, bsize))); //memailgn required here?
-		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);
-	}
+	memset(td, 0, sizeof(struct general_td));
+	td->flags = LE(0);
+	td->nexttd = LE(0);
+	td->cbp = td->be = LE(0);
 	return td;
 }
 
+#ifdef _USE_C_Q
 static void control_quirk()
 {
 	static struct endpoint_descriptor *ed = 0; /* empty ED */
@@ -90,9 +87,8 @@ static void control_quirk()
 			return;
 		}
 
-#define ED_MASK ((u32)~0x0f)
-		ed->tailp = ed->headp = ACCESS_LE(virt_to_phys((void*) ((u32)td & ED_MASK)));
-		ed->flags |= ACCESS_LE(OHCI_ENDPOINT_DIRECTION_OUT);
+		ed->tailp = ed->headp = LE(virt_to_phys((void*) ((u32)td & OHCI_ENDPOINT_HEAD_MASK)));
+		ed->flags |= LE(OHCI_ENDPOINT_DIRECTION_OUT);
 	}
 
 	/*
@@ -140,6 +136,7 @@ static void control_quirk()
 		printf("nohead!\n");
 	}
 }
+#endif
 
 
 static void dbg_op_state() 
@@ -172,179 +169,264 @@ static void dbg_td_flag(u32 flag)
 	printf("********************************************************\n");
 }
 
-static void general_td_fill(struct general_td *dest, usb_transfer_descriptor *src)
+static void general_td_fill(struct general_td *dest, const usb_transfer_descriptor *src)
 {
-	(void) memcpy((void*) (phys_to_virt(ACCESS_LE(dest->cbp))), src->buffer, src->actlen); 
-	dest->flags &= ACCESS_LE(~OHCI_TD_DIRECTION_PID_MASK);
+	if(src->actlen) {
+		dest->cbp = LE(virt_to_phys(src->buffer));
+		dest->be = LE(LE(dest->cbp) + src->actlen - 1);
+		/* save virtual address here */
+		dest->bufaddr = (u32) src->buffer;
+	}
+	else {
+		dest->cbp = dest->be = LE(0);
+		dest->bufaddr = 0;
+	}
+
+	dest->buflen = src->actlen;
+
+	dest->flags &= LE(~OHCI_TD_DIRECTION_PID_MASK);
 	switch(src->pid) {
 		case USB_PID_SETUP:
 			printf("pid_setup\n");
-			dest->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_SETUP);
-			dest->flags |= ACCESS_LE(OHCI_TD_TOGGLE_0);
-			dest->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
+			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:
 			printf("pid_out\n");
-			dest->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_OUT);
-			dest->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
+			dest->flags |= LE(OHCI_TD_DIRECTION_PID_OUT);
+			dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
 
 			/*
-			 * TODO: just temporary solution!
+			 * TODO: just temporary solution! (consider it with len?)
 			 * there can be also regular PID_OUT pakets
 			 */
-			dest->flags |= ACCESS_LE(OHCI_TD_TOGGLE_1);
+			dest->flags |= LE(OHCI_TD_TOGGLE_1);
 			break;
 		case USB_PID_IN:
 			printf("pid_in\n");
-			dest->flags |= ACCESS_LE(OHCI_TD_DIRECTION_PID_IN);
-			dest->flags |= ACCESS_LE(OHCI_TD_BUFFER_ROUNDING);
+			dest->flags |= LE(OHCI_TD_DIRECTION_PID_IN);
+			if(src->maxp > src->actlen) {
+				dest->flags |= LE(OHCI_TD_BUFFER_ROUNDING);
+				printf("round buffer!\n");
+			}
 			/*
 			 * let the endpoint do the togglestuff!
 			 * TODO: just temporary solution!
 			 * there can be also inregular PID_IN pakets (@Status Stage)
 			 */
-			dest->flags |= ACCESS_LE(OHCI_TD_TOGGLE_CARRY);
-#if 0
-			/* should be done by HC!
-			 * first pid_in start with DATA0 */
-			 */
-			dummyconfig.headp = ACCESS_LE( src->togl ?
-					ACCESS_LE(dummyconfig.headp) | OHCI_ENDPOINT_TOGGLE_CARRY :
-					ACCESS_LE(dummyconfig.headp) & ~OHCI_ENDPOINT_TOGGLE_CARRY);
-#endif
+			dest->flags |= LE(OHCI_TD_TOGGLE_CARRY);
 			break;
 	}
-	dest->flags |= ACCESS_LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
-	sync_after_write(dest, sizeof(struct general_td));
-	sync_after_write((void*) phys_to_virt(ACCESS_LE(dest->cbp)), src->actlen);
+	dest->flags |= LE(OHCI_TD_SET_DELAY_INTERRUPT(7));
 }
 
+#ifdef _DU_OHCI_F
 static void dump_address(void *addr, u32 size, const char* str)
 {
-	sync_before_read(addr, size);
-	printf("%s hexdump @ 0x%08X:\n", str, addr);
+	printf("%s hexdump (%d) @ 0x%08X:\n", str, size, addr);
 	hexdump(addr, size);
 }
+#endif
 
-/**
- * Enqueue a transfer descriptor.
- */
-u8 first = 0;
-u8 hcdi_enqueue(usb_transfer_descriptor *td) {
-	static struct general_td *tSetup,*tData;
-	static u32 tSetupbuffer, tDatabuffer, tStatusbuffer;
-	static u32 tSetupblen, tDatablen, tStatusblen;
-
-	if(first == 0) {
-		printf("step 0\n");
-		tSetup = allocate_general_td(td->actlen);
-		general_td_fill(tSetup, td);
-		tSetupbuffer = (u32) phys_to_virt(ACCESS_LE(tSetup->cbp)); 
-		tSetupblen = td->actlen;
-		first++;
-		return 0;
-	}
-	if(first == 1) {
-		printf("step 1\n");
-		tData = allocate_general_td(td->actlen);
-		general_td_fill(tData, td);
-		tDatabuffer = (u32) phys_to_virt(ACCESS_LE(tData->cbp)); 
-		tDatablen = td->actlen;
-		first++;
-		return 0;
+static struct endpoint_descriptor _edhead;
+struct endpoint_descriptor *edhead = 0;
+void hcdi_fire()
+{
+#ifdef _DU_OHCI_F
+	printf("<^>  <^>  <^> hcdi_fire(start)\n");
+#endif
+
+	if(edhead == 0)
+		return;
+
+#ifdef _USE_C_Q
+	required? YES! :O ... erm... or no? :/ ... in fact I have no idea
+	control_quirk(); 
+#endif
+
+	write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(edhead));
+
+	/* sync it all */
+	sync_after_write(edhead, sizeof(struct endpoint_descriptor));
+#ifdef _DU_OHCI_F
+	dump_address(edhead, sizeof(struct endpoint_descriptor), "edhead(before)");
+#endif
+
+	struct general_td *x = phys_to_virt(LE(edhead->headp) & OHCI_ENDPOINT_HEAD_MASK);
+	while(virt_to_phys(x)) {
+		sync_after_write(x, sizeof(struct general_td));
+#ifdef _DU_OHCI_F
+		dump_address(x, sizeof(struct general_td), "x(before)");
+#endif
+
+		if(x->buflen > 0) {
+			sync_after_write((void*) phys_to_virt(LE(x->cbp)), x->buflen);
+#ifdef _DU_OHCI_F
+			dump_address((void*) phys_to_virt(LE(x->cbp)), x->buflen, "x->cbp(before)");
+#endif
+		}
+		x = phys_to_virt(LE(x->nexttd));
 	}
-	first = 0;
-	struct general_td *tStatus = allocate_general_td(td->actlen);
-	general_td_fill(tStatus, td);
-	tStatusbuffer = (u32) phys_to_virt(ACCESS_LE(tStatus->cbp)); 
-	tStatusblen = td->actlen;
-
-	printf(	"===========================\n"
-			"===========================\n");
-	control_quirk(); //required? YES! :O ... erm... or no? :/ ... in fact I have no idea
-
-	struct endpoint_descriptor *dummyconfig = allocate_endpoint();
-	dummyconfig->flags = ACCESS_LE(OHCI_ENDPOINT_GENERAL_FORMAT);
-	dummyconfig->headp = dummyconfig->tailp = dummyconfig->nexted = ACCESS_LE(0);
-	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));
-	write32(OHCI0_HC_CTRL_HEAD_ED, virt_to_phys(dummyconfig));
-
-#define ED_MASK ((u32)~0x0f) 
-	dummyconfig->headp |= ACCESS_LE(virt_to_phys((void*) ((u32)tSetup & ED_MASK)));
-	tSetup->nexttd = ACCESS_LE(virt_to_phys((void*) ((u32)tData & ED_MASK)));
-	tData->nexttd = ACCESS_LE(virt_to_phys((void*) ((u32)tStatus & ED_MASK)));
-
-	sync_after_write(dummyconfig, 16);
-	sync_after_write(tSetup, sizeof(struct general_td));
-	sync_after_write(tData, sizeof(struct general_td));
-	sync_after_write(tStatus, sizeof(struct general_td));
-
-	dump_address(tSetup, sizeof(struct general_td), "tSetup(before)");
-	dump_address((void*) phys_to_virt(ACCESS_LE(tSetup->cbp)), tSetupblen, "tSetup->cbp(before)");
-
-	dump_address(tData, sizeof(struct general_td), "tData(before)");
-	dump_address((void*) phys_to_virt(ACCESS_LE(tData->cbp)), tDatablen, "tData->cbp(before)");
-
-	dump_address(tStatus, sizeof(struct general_td), "tStatus(before)");
-	dump_address((void*) phys_to_virt(ACCESS_LE(tStatus->cbp)), tStatusblen, "tStatus->cbp(before)");
-
-	dump_address(dummyconfig, sizeof(struct endpoint_descriptor), "dummyconfig(before)");
-
-	printf("ctrl head: 0x%08X\n", read32(OHCI0_HC_CTRL_HEAD_ED));
+
 	/* trigger control list */
 	set32(OHCI0_HC_CONTROL, OHCI_CTRL_CLE);
 	write32(OHCI0_HC_COMMAND_STATUS, OHCI_CLF);
 
-	//don't use this quirk stuff here!
-#if 1
-	while(!read32(OHCI0_HC_CTRL_CURRENT_ED)) {
-	}
+	struct general_td *n=0, *prev = 0, *next = 0;
+	/* poll until edhead->headp is null */
+	do {
+		sync_before_read(edhead, sizeof(struct endpoint_descriptor));
+#ifdef _DU_OHCI_F
+		printf("edhead->headp: 0x%08X\n", LE(edhead->headp));
+		udelay(10000);
 #endif
 
-	udelay(1000000);
-	u32 current = read32(OHCI0_HC_CTRL_CURRENT_ED);
-	printf("current: 0x%08X\n", current);
-	printf("+++++++++++++++++++++++++++++\n");
-	udelay(10000000);
+		/* if halted, debug output plz. will break the transfer */
+		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
+			printf("halted!\n");
+#endif
 
-	dump_address(tSetup, sizeof(struct general_td), "tSetup(after)");
-	dump_address((void*) phys_to_virt(ACCESS_LE(tSetup->cbp)), tSetupblen, "tSetup->cbp(after)");
-	dump_address((void*) tSetupbuffer, tSetupblen, "tSetupbuffer");
-	dbg_td_flag(ACCESS_LE(tSetup->flags));
+			sync_before_read((void*) n, sizeof(struct general_td));
+#ifdef _DU_OHCI_F
+			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
+				dump_address((void*) n->bufaddr, n->buflen, "n->bufaddr(after)");
+#endif
+			}
+			dbg_td_flag(LE(n->flags));
 
-	dump_address(tData, sizeof(struct general_td), "tData(after)");
-	dump_address((void*) phys_to_virt(ACCESS_LE(tData->cbp)), tDatablen, "tData->cbp(after)");
-	dump_address((void*) tDatabuffer, tDatablen, "tDatabuffer");
-	dbg_td_flag(ACCESS_LE(tData->flags));
+			sync_before_read((void*) prev, sizeof(struct general_td));
+#ifdef _DU_OHCI_F
+			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
+				dump_address((void*) prev->bufaddr, prev->buflen, "prev->bufaddr(after)");
+#endif
+			}
+#ifdef _DU_OHCI_F
+			dbg_td_flag(LE(prev->flags));
+			printf("halted end!\n");
+#endif
+			return;
+		}
+		prev = (struct general_td*) (LE(edhead->headp)&~0xf);
+	} while(LE(edhead->headp)&~0xf);
+
+	n = phys_to_virt(read32(OHCI0_HC_DONE_HEAD) & ~1);
+#ifdef _DU_OHCI_F
+	printf("hc_done_head: 0x%08X\n", read32(OHCI0_HC_DONE_HEAD));
+#endif
+
+	prev = 0; next = 0;
+	/* reverse done queue */
+	while(virt_to_phys(n) && edhead->tdcount) {
+		sync_before_read((void*) n, sizeof(struct general_td));
+#ifdef _DU_OHCI_F
+		printf("n: 0x%08X\n", n);
+		printf("next: 0x%08X\n", next);
+		printf("prev: 0x%08X\n", prev);
+#endif
+
+		next = n;
+		n = (struct general_td*) phys_to_virt(LE(n->nexttd));
+		next->nexttd = (u32) prev;
+		prev = next;
+
+		edhead->tdcount--;
+	}
 
-	dump_address(tStatus, sizeof(struct general_td), "tStatus(after)");
-	//dump_address((void*) phys_to_virt(ACCESS_LE(tStatus->cbp)), tStatusblen, "tStatus->cbp(after)");
-	//dump_address((void*) tStatusbuffer, tStatusblen, "tStatusbuffer");
-	dbg_td_flag(ACCESS_LE(tStatus->flags));
+	n = next;
+	prev = 0;
+	while(virt_to_phys(n)) {
+#ifdef _DU_OHCI_F
+		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
+			dump_address((void*) n->bufaddr, n->buflen, "n->bufaddr(after)");
+#endif
+		}
+#ifdef _DU_OHCI_F
+		dbg_td_flag(LE(n->flags));
+#endif
+		prev = n;
+		n = (struct general_td*) n->nexttd;
+		free(prev);
+	}
 
-	dump_address(dummyconfig, sizeof(struct endpoint_descriptor), "dummyconfig(after)");
+	hcca_oh0.done_head = 0;
+	sync_after_write(&hcca_oh0, sizeof(hcca_oh0));
 
-	/* disable control list */
 	write32(OHCI0_HC_CONTROL, read32(OHCI0_HC_CONTROL)&~OHCI_CTRL_CLE);
 
-	/* 
-	 * TD should be free'd after taking it from the done queue.
-	 * but we are very very dirty and do it anyway :p
-	 */
+	edhead = 0;
 
-	/* only when a buffer is allocated */
-#if 0
-	if(td->actlen)
-		free((void*)tStatusbuffer);
-	free(tStatus);
+#ifdef _DU_OHCI_F
+	printf("<^>  <^>  <^> hcdi_fire(end)\n");
+#endif
+}
+
+/**
+ * Enqueue a transfer descriptor.
+ */
+u8 hcdi_enqueue(const usb_transfer_descriptor *td) {
+#ifdef _DU_OHCI_Q
+	printf("*()*()*()*()*()*()*() hcdi_enqueue(start)\n");
+#endif
+	if(!edhead) {
+		edhead = &_edhead;
+		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) |
+				OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(td->endpoint) |
+				OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(td->maxp));
+		edhead->tdcount = 0;
+	}
+
+	struct general_td *tdhw = allocate_general_td();
+	general_td_fill(tdhw, td);
+	edhead->tdcount ++;
+
+	if(!edhead->headp) {
+		/* first transfer */
+		edhead->headp = LE(virt_to_phys((void*) ((u32)tdhw & OHCI_ENDPOINT_HEAD_MASK)));
+	}
+	else {
+		/* headp in endpoint already exists
+		 * => go to list end
+		 */
+		struct general_td *n = (struct general_td*) phys_to_virt(LE(edhead->headp) & OHCI_ENDPOINT_HEAD_MASK);
+		while(LE(n->nexttd)) {
+			n = phys_to_virt(LE(n->nexttd));
+		}
+		n->nexttd = LE(virt_to_phys((void*) ((u32)tdhw & OHCI_ENDPOINT_HEAD_MASK)));
+#ifdef _DU_OHCI_Q
+		printf("n: 0x%08X\n", n);
+		printf("n->nexttd: 0x%08X\n", phys_to_virt(LE(n->nexttd)));
+#endif
+	}
+
+#ifdef _DU_OHCI_Q
+	printf("*()*()*()*()*()*()*() hcdi_enqueue(end)\n");
 #endif
-	printf("hcdi_enqueue, done!\n");
 	return 0;
 }
 
+
 /**
  * Remove an transfer descriptor from transfer queue.
  */
@@ -433,15 +515,19 @@ void hcdi_init()
 
 static void configure_ports(u8 from_init)
 {
+#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
 
 	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)
@@ -455,7 +541,9 @@ static void setup_port(u32 reg, u8 from_init)
 		/* clear CSC flag, set PES and start port reset (PRS) */
 		write32(reg, RH_PS_PES);
 		while(!(read32(reg) & RH_PS_PES)) {
+#ifdef _DU_OHCI_RH
 			printf("fu\n");
+#endif
 			return;
 		}
 
@@ -463,9 +551,9 @@ static void setup_port(u32 reg, u8 from_init)
 
 		/* spin until port reset is complete */
 		while(!(read32(reg) & RH_PS_PRSC)); // hint: it may stuck here
+#ifdef _DU_OHCI_RH
 		printf("loop done\n");
-
-		wait_ms(20);
+#endif
 
 		(void) usb_add_device();
 	}
@@ -541,5 +629,5 @@ void hcdi_irq()
 void show_frame_no()
 {
 	sync_before_read(&hcca_oh0, 256);
-	printf("***** frame_no: %d *****\n", ACCESS_LE(hcca_oh0.frame_no));
+	printf("***** frame_no: %d *****\n", LE(hcca_oh0.frame_no));
 }