#include "bootmii_ppc.h"
#include "ohci.h"
+#include "irq.h"
#define gecko_printf printf
-#define set32(address, flags) write32(address, read32(address) | flags)
-#define dma_addr(address) (u32)address
-
-/* stolen from libogc - gc/ogc/machine/processor.h */
-#define _CPU_ISR_Disable( _isr_cookie ) \
- { register u32 _disable_mask = 0; \
- _isr_cookie = 0; \
- __asm__ __volatile__ ( \
- "mfmsr %0\n" \
- "rlwinm %1,%0,0,17,15\n" \
- "mtmsr %1\n" \
- "extrwi %0,%0,1,16" \
- : "=&r" ((_isr_cookie)), "=&r" ((_disable_mask)) \
- : "0" ((_isr_cookie)), "1" ((_disable_mask)) \
- ); \
- }
-
-#define _CPU_ISR_Restore( _isr_cookie ) \
- { register u32 _enable_mask = 0; \
- __asm__ __volatile__ ( \
- " cmpwi %0,0\n" \
- " beq 1f\n" \
- " mfmsr %1\n" \
- " ori %1,%1,0x8000\n" \
- " mtmsr %1\n" \
- "1:" \
- : "=r"((_isr_cookie)),"=&r" ((_enable_mask)) \
- : "0"((_isr_cookie)),"1" ((_enable_mask)) \
- ); \
- }
+#define dma_addr(address) virt_to_phys(address)
static struct ohci_hcca hcca_oh0;
within 2msec else HC enters RESUME */
- //u32 cookie = irq_kill();
- u32 cookie;
- _CPU_ISR_Disable(cookie);
-
+ u32 cookie = irq_kill();
/* Tell the controller where the control and bulk lists are
* The lists are empty now. */
write32(OHCI0_HC_INT_ENABLE, OHCI_INTR_INIT);
- //irq_restore(cookie);
- _CPU_ISR_Restore(cookie);
-
+ irq_restore(cookie);
dbg_op_state();
-
}