From d44bf5acb015edaeacc022f423bae4743b868f53 Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Fri, 24 Dec 2021 14:30:23 -0800
Subject: Save USB for later
---
later/usb.c | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
later/usb.h | 68 ++++++++++
src/cpu/irq.c | 21 ----
src/drivers/usb.c | 327 -------------------------------------------------
src/drivers/usb.h | 68 ----------
src/sys/core.c | 7 --
src/sys/core.h | 5 -
7 files changed, 429 insertions(+), 428 deletions(-)
create mode 100644 later/usb.c
create mode 100644 later/usb.h
delete mode 100644 src/drivers/usb.c
delete mode 100644 src/drivers/usb.h
diff --git a/later/usb.c b/later/usb.c
new file mode 100644
index 0000000..371f470
--- /dev/null
+++ b/later/usb.c
@@ -0,0 +1,361 @@
+#include "../drivers/uart.h"
+#include "../drivers/usb.h"
+#include "../sys/core.h"
+
+#define DRIVERS_USB_C
+unsigned char usb_buffer0[256] = {0};
+unsigned char usb_buffer1[256] = {0};
+unsigned char usb_buffer3[256] = {0};
+
+void my_memcpy(void *dest, void *src, size_t n) {
+ char *src_char = (char *)src;
+ char *dest_char = (char *)dest;
+ for (size_t i=0; i<n; i++) {
+ dest_char[i] = src_char[i];
+ }
+}
+
+static void *my_memset(void *s, int c, size_t n)
+{
+ const uint8_t uc = c % 0xff;
+ uint8_t *p = (uint8_t *)s;
+
+ while (n-- > 0)
+ *p++ = uc;
+
+ return (s);
+}
+
+static void txrx_control_msg(uint8_t txlen)
+{
+ // send setup & control packet
+ // set dma buffer
+ *USB_HOST_HCDMA0 = (uint64_t) usb_buffer0;
+ *USB_HOST_HCDMA0 |= 0xC0000000;
+ // HCTSIZ0.Pid = 2'd3 (SETUP) , HCTSIZ0.PktCnt = 10'h1 , HCTSIZ0.XferSize = 18'd8
+ *USB_HOST_HCTSIZ0 = 3 << 29 | 1 << 19 | txlen;
+ // HCCAR1.ChEna = 1'b1
+ *USB_HOST_HCCHAR0 |= 1<<31;
+
+ // recieve control packet
+ // set dma buffer
+ *USB_HOST_HCDMA1 = (uint64_t) usb_buffer1;
+ *USB_HOST_HCDMA1 |= 0xC0000000;
+ // HCTSIZ1.Pid = 2'd2 (DATA1) , HCTSIZ1.PktCnt = 10'h1 , HCTSIZ1.XferSize = 18'd64
+ *USB_HOST_HCTSIZ1 = 2 << 29 | 1 << 19 | 64;
+ // HCCAR1.ChEna = 1'b1
+ *USB_HOST_HCCHAR1 |= 1<<31;
+}
+
+void usbhost_id(void)
+{
+ uart_string("USB_CORE_GUID ");
+ uart_hex(*USB_CORE_GUID);
+ uart_string("\nUSB_CORE_GSNPSID ");
+ uart_hex(*USB_CORE_GSNPSID);
+ uart_char('\n');
+}
+
+void usbhost_start(void)
+{
+ // USB Host power on
+ // HPRT.PrtPwr = 1'b1 -> HPRT.PrtRst = 1'b1 -> wait 60msec -> HPRT.PrtRst = 1'b0
+ *USB_HOST_HPRT |= 1 << 12;
+ *USB_HOST_HPRT |= 1 << 8;
+ delay(0x100000);
+ *USB_HOST_HPRT &= ~(1 << 8);
+
+ // enable irq
+ // GAHBCFG.GlblIntrMsk = 1'b1
+ // GINTMSK.ConIDStsChngMsk = 1'b1, GINTMSK.PrtIntMsk = 1'b1, GINTMSK.SofMsk = 1'b1
+ *USB_CORE_GAHBCFG |= 1;
+ *USB_CORE_GINTMSK = 1 << 28 | 1 << 24 | 0 << 3;
+
+ // port enable and retry detect
+ // HPRT.PrtPwr = 1'b1, HPRT.PrtEnChng = 1'b1, HPRT.PrtConnDet = 1'b1
+ *USB_HOST_HPRT = 1 << 12 | 1 << 3 | 1 << 1;
+
+ // enable channel irq
+ // HAINTMASK.HAINTMsk = 16'h3
+ // HCINTMSK0.XferComplMsk = 1'b1
+ *USB_HOST_HAINTMSK |= 0x3;
+ *USB_HOST_HCINTMSK0 |= 1;
+ *USB_HOST_HCINTMSK1 |= 1;
+
+ // HCCAR1.EPDir = 1'b0 (OUT) / 1'b01(IN), HCCAR1.MPS = 11'h40
+ *USB_HOST_HCCHAR0 |= 0x40; // OUT
+ *USB_HOST_HCCHAR1 |= 1 << 15 | 0x40; // IN
+}
+
+void usbhost_poll_intr(void)
+{
+ uint8_t dev = 2;
+
+ my_memset(usb_buffer3, 0, 256);
+
+ // HCCAR3.EPType = 2'b11 (Interupt), HCCAR3.EPDir = 1'b01(IN), HCCAR3.MPS = 11'h40
+ *USB_HOST_HCCHAR3 |= 3 << 18 | 1 << 15 | 1 << 11 | 0x40; // IN
+ *USB_HOST_HCCHAR3 |= dev << 22 ;
+
+ // recieve interrupt transfer
+ // set dma buffer
+ *USB_HOST_HCDMA3 = (uint64_t) usb_buffer3;
+ *USB_HOST_HCDMA3 |= 0xC0000000;
+ // HCTSIZ1.Pid = 2'd2 (DATA1) , HCTSIZ1.PktCnt = 10'h1 , HCTSIZ1.XferSize = 18'd64
+ *USB_HOST_HCTSIZ3 = 2 << 29 | 1 << 19 | 64;
+ // HCCAR1.ChEna = 1'b1
+ *USB_HOST_HCCHAR3 |= 1<<31;
+
+ uart_string("HUB INT ");
+ for (int i = 0; i < 2; i++) {
+ uart_hex(usb_buffer3[i]);
+ uart_char(' ');
+ }
+ uart_char('\n');
+}
+
+static void prepare_control_msg(void)
+{
+ my_memset(usb_buffer0, 0, 256);
+ my_memset(usb_buffer1, 0, 256);
+
+ // HCCAR1.EPDir = 1'b0 (OUT) / 1'b01(IN), HCCAR1.MPS = 11'h40
+ *USB_HOST_HCCHAR0 |= 0x40; // OUT
+ *USB_HOST_HCCHAR1 |= 1 << 15 | 0x40; // IN
+
+ //clear dev
+ *USB_HOST_HCCHAR0 &= ~(0x7f << 22);
+ *USB_HOST_HCCHAR1 &= ~(0x7f << 22);
+}
+
+
+void usbhost_get_descriptor(uint8_t dev, uint8_t descriptor_type, bool is_hub)
+{
+ prepare_control_msg();
+
+ *USB_HOST_HCCHAR0 |= dev << 22;
+ *USB_HOST_HCCHAR1 |= dev << 22;
+
+ // build packet
+ my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
+ .Type = is_hub ? 0xA0 : 0x80, // DEVICE_TO_HOST | STANDARD | DEVICE
+ .Request = 0x06, // GET_DESCRIPTOR
+ .Value = descriptor_type << 8 | 0x00, // descriptor.type = 0x01, decriptor.index = 0x00
+ .Index = 0,
+ .Length = 64,
+ }, 8);
+
+ txrx_control_msg(8);
+}
+
+void usbhost_get_portstatus(uint8_t dev, uint8_t port, bool is_hub)
+{
+ prepare_control_msg();
+
+ *USB_HOST_HCCHAR0 |= dev << 22;
+ *USB_HOST_HCCHAR1 |= dev << 22;
+
+ // build packet
+ my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
+ .Type = is_hub ? 0xA3 : 0x80, // DEVICE_TO_HOST | CLASS or STANDARD | DEVICE
+ .Request = 0x00, // GET_STATUS
+ .Index = port,
+ .Length = 4,
+ }, 8);
+
+ txrx_control_msg(8);
+
+ uart_string("PORT STATUS ");
+ uart_10(port);
+ for (int i = 0; i < 4; i++) {
+ uart_hex(usb_buffer1[i]);
+ uart_char(' ');
+ }
+ uart_char('\n');
+}
+
+void usbhost_set_address(uint8_t address)
+{
+ prepare_control_msg();
+
+ // build packet
+ my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
+ .Type = 0,
+ .Request = 5, // Set address request
+ .Value = address, // Address to set
+ }, 8);
+
+ txrx_control_msg(8);
+}
+
+void usbhost_set_config(uint8_t dev, uint8_t config)
+{
+ prepare_control_msg();
+
+ *USB_HOST_HCCHAR0 |= dev << 22;
+ *USB_HOST_HCCHAR1 |= dev << 22;
+
+ // build packet
+ my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
+ .Type = 0,
+ .Request = 9, // Set config
+ .Value = config, // Address to set
+ .Length = 0,
+ }, 8);
+
+ txrx_control_msg(8);
+}
+
+void usbhost_set_portfeature(uint8_t dev, uint8_t port, uint16_t feature)
+{
+ prepare_control_msg();
+
+ *USB_HOST_HCCHAR0 |= dev << 22;
+ *USB_HOST_HCCHAR1 |= dev << 22;
+
+ // build packet
+ my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
+ .Type = 0x23, // ??
+ .Request = 0x03, // SET_FEATURE
+ .Value = (uint16_t)feature, // Feature we are changing
+ .Index = port,
+ .Length = 0,
+ }, 8);
+
+ txrx_control_msg(8);
+}
+
+void usbhost_clear_portfeature(uint8_t dev, uint8_t port, uint16_t feature)
+{
+ prepare_control_msg();
+
+ *USB_HOST_HCCHAR0 |= dev << 22;
+ *USB_HOST_HCCHAR1 |= dev << 22;
+
+ // build packet
+ my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
+ .Type = 0x23, // ??
+ .Request = 0x01, // CLEAR_FEATURE
+ .Value = feature,
+ .Index = port,
+ .Length = 0,
+ }, 8);
+
+ txrx_control_msg(8);
+}
+
+void usb_trig(void)
+{
+ usbhost_id();
+ usbhost_start();
+
+ uart_string("GET DEVICE_DESCRIPTOR\n");
+ usbhost_get_descriptor(0, 0x01, false);
+ for (int i = 0; i < 18; i++) {
+ uart_hex(usb_buffer1[i]);
+ uart_char(' ');
+ }
+ uart_char('\n');
+
+ uart_string("SET ADDRESS 2\n");
+ usbhost_set_address(2);
+
+ uart_string("GET CONFIG_DESCRIPTOR\n");
+ usbhost_get_descriptor(2, 0x02, false);
+ for (int i = 0; i < 18; i++) {
+ uart_hex(usb_buffer1[i]);
+ uart_char(' ');
+ }
+ uart_char('\n');
+
+ uart_string("SET CONFIG 1\n");
+ usbhost_set_config(2, 1);
+
+ uart_string("GET HUB_DESCRIPTOR\n");
+ usbhost_get_descriptor(2, 41, true);
+ for (int i = 0; i < 18; i++) {
+ uart_hex(usb_buffer1[i]);
+ uart_char(' ');
+ }
+ uart_char('\n');
+ uart_string("Hub device 0 has ");
+ uart_10(usb_buffer1[2]);
+ uart_string(" ports\n");
+
+ usbhost_get_portstatus(2, 0, false);
+ usbhost_get_portstatus(2, 1, true);
+ usbhost_clear_portfeature(2, 1, 0x0010);
+ usbhost_get_portstatus(2, 1, true);
+
+ uart_string("SET PORT 1 POWER ON\n");
+ usbhost_set_portfeature(2, 1, 0x0008);
+ usbhost_get_portstatus(2, 1, true);
+
+ delay(0x100000);
+
+ uart_string("CLEAR PORT FEATURE\n");
+ usbhost_clear_portfeature(2, 1, 0x0010);
+ // usbhost_get_portstatus(2, 1, true);
+ // usbhost_poll_intr();
+
+ uart_string("SET PORT 1 RESET\n");
+ usbhost_set_portfeature(2, 1, 0x0004);
+ // usbhost_poll_intr();
+
+ uart_string("CLEAR PORT FEATURE\n");
+ usbhost_clear_portfeature(2, 1, 0x0014);
+ usbhost_clear_portfeature(2, 1, 0x0011);
+ // usbhost_get_portstatus(2, 1, true);
+ // usbhost_poll_intr();
+
+ uart_string("GET DEVICE_DESCRIPTOR\n");
+ usbhost_get_descriptor(0, 0x01, false);
+ for (int i = 0; i < 18; i++) {
+ uart_hex(usb_buffer1[i]);
+ uart_char(' ');
+ }
+ uart_string("\n");
+
+ usbhost_set_address(3);
+ uart_string("GET CONFIG_DESCRIPTOR\n");
+ usbhost_get_descriptor(3, 0x02, false);
+ for (int i = 0; i < 18; i++) {
+ uart_hex(usb_buffer1[i]);
+ uart_char(' ');
+ }
+ uart_string("\n");
+}
+
+
+/* src/cpu/irq.c
+ } else if (load32(IRQ_PENDING1) & (1 << 9)) {
+ unsigned long reg = *USB_CORE_GINTSTS;
+ *USB_CORE_GINTSTS = reg; //clear
+ g_Drawer.y = 20;
+ write_hex32(&g_Drawer, reg);
+ g_Drawer.x = 0;
+ g_Drawer.y = 0;
+ if (reg & 1 << 28) { uart_string("Connector ID Status Change\n"); }
+ if (reg & 1 << 27) { uart_string("LPM Transaction Received Interrupt\n"); }
+ if (reg & 1 << 26) { uart_string("Periodic TxFIFO Empty\n"); }
+ if (reg & 1 << 25) { uart_string("Host Channels Interrupt\n");
+ }
+ if (reg & 1 << 24) { *USB_HOST_HPRT |= 1 << 1; //clear host port interrupt
+ uart_string("Host Port Interrupt\n"); }
+ if (reg & 1 << 6) { uart_string("Global IN Non-periodic NAK Effective\n"); }
+ if (reg & 1 << 5) { uart_string("Non-periodic TxFIFO Empty\n"); }
+ if (reg & 1 << 4) { uart_string("Host and Device RxFIFO Non-Empty (RxFLvl) \n"); }
+ if (reg & 1 << 3) { uart_string("Host and Device Start of Frame\n"); }
+ if (reg & 1 << 2) { uart_string("OTG Interrupt\n"); }
+ if (reg & 1 << 1) { uart_string("Mode Mismatch Interrupt\n"); }
+
+
+ * src/sys/core.c sysinit(void)
+ // Enable USB Interrupt
+ store32(1<<9, IRQ_ENABLE1);
+ usbhost_start();
+
+
+ * src/sys/core.c postinit()
+ usb_trig();
+*/
diff --git a/later/usb.h b/later/usb.h
new file mode 100644
index 0000000..e1aae5f
--- /dev/null
+++ b/later/usb.h
@@ -0,0 +1,68 @@
+#ifndef DRIVERS_USB_H
+#define DRIVERS_USB_H
+
+#ifndef DRIVERS_USB_C
+extern unsigned char usb_buffer0[256];
+extern unsigned char usb_buffer1[256];
+#endif
+
+#define size_t unsigned int
+#define bool unsigned char
+#define uint8_t unsigned char
+#define uint16_t unsigned short
+#define uint32_t unsigned long
+#define uint64_t unsigned long long
+#define true 1
+#define false 0
+
+#define USB_BASE 0x3F980000
+//CORE
+#define USB_CORE_GAHBCFG ((volatile uint32_t *)(0x8 + USB_BASE))
+#define USB_CORE_GINTSTS ((volatile uint32_t *)(0x14 + USB_BASE))
+#define USB_CORE_GINTMSK ((volatile uint32_t *)(0x18 + USB_BASE))
+#define USB_CORE_GUID ((volatile uint32_t *)(0x3C + USB_BASE))
+#define USB_CORE_GSNPSID ((volatile uint32_t *)(0x40 + USB_BASE))
+//HOST
+#define USB_HOST_HCFG ((volatile uint32_t *)(0x400 + USB_BASE))
+#define USB_HOST_HAINTMSK ((volatile uint32_t *)(0x418 + USB_BASE))
+#define USB_HOST_HPRT ((volatile uint32_t *)(0x440 + USB_BASE))
+//CHANNEL
+#define USB_HOST_HCCHAR0 ((volatile uint32_t *)(0x500 + USB_BASE))
+#define USB_HOST_HCINTMSK0 ((volatile uint32_t *)(0x50C + USB_BASE))
+#define USB_HOST_HCTSIZ0 ((volatile uint32_t *)(0x510 + USB_BASE))
+#define USB_HOST_HCDMA0 ((volatile uint32_t *)(0x514 + USB_BASE))
+#define USB_HOST_HCCHAR1 ((volatile uint32_t *)(0x520 + USB_BASE))
+#define USB_HOST_HCINTMSK1 ((volatile uint32_t *)(0x52C + USB_BASE))
+#define USB_HOST_HCTSIZ1 ((volatile uint32_t *)(0x530 + USB_BASE))
+#define USB_HOST_HCDMA1 ((volatile uint32_t *)(0x534 + USB_BASE))
+
+#define USB_HOST_HCCHAR2 ((volatile uint32_t *)(0x540 + USB_BASE))
+#define USB_HOST_HCINTMSK2 ((volatile uint32_t *)(0x54C + USB_BASE))
+#define USB_HOST_HCTSIZ2 ((volatile uint32_t *)(0x550 + USB_BASE))
+#define USB_HOST_HCDMA2 ((volatile uint32_t *)(0x554 + USB_BASE))
+#define USB_HOST_HCCHAR3 ((volatile uint32_t *)(0x560 + USB_BASE))
+#define USB_HOST_HCINTMSK3 ((volatile uint32_t *)(0x56C + USB_BASE))
+#define USB_HOST_HCTSIZ3 ((volatile uint32_t *)(0x570 + USB_BASE))
+#define USB_HOST_HCDMA3 ((volatile uint32_t *)(0x574 + USB_BASE))
+
+struct UsbDeviceRequest {
+ uint8_t Type;
+ uint8_t Request;
+ uint16_t Value;
+ uint16_t Index;
+ uint16_t Length;
+} __attribute__((__packed__));
+
+void send_packet(void);
+void usbhost_start(void);
+void usbhost_id(void);
+void usbhost_get_descriptor(uint8_t dev, uint8_t descriptor_type, bool is_hub);
+void usbhost_get_portstatus(uint8_t dev, uint8_t port, bool is_hub);
+void usbhost_set_address(uint8_t address);
+void usbhost_set_config(uint8_t dev, uint8_t config);
+void usbhost_set_portfeature(uint8_t dev, uint8_t port, uint16_t feature);
+void usbhost_clear_portfeature(uint8_t dev, uint8_t port, uint16_t feature);
+void usbhost_poll_intr(void);
+void usb_trig(void);
+
+#endif
diff --git a/src/cpu/irq.c b/src/cpu/irq.c
index e99b398..f2b326e 100644
--- a/src/cpu/irq.c
+++ b/src/cpu/irq.c
@@ -1,6 +1,5 @@
#include "../cpu/irq.h"
#include "../drivers/uart.h"
-#include "../drivers/usb.h"
#include "../graphics/drawer.h"
#include "../sys/core.h"
#include "../sys/timer.h"
@@ -93,26 +92,6 @@ void c_irq_handler(void) {
enableirq();
return;
}
- } else if (load32(IRQ_PENDING1) & (1 << 9)) {
- unsigned long reg = *USB_CORE_GINTSTS;
- *USB_CORE_GINTSTS = reg; //clear
- g_Drawer.y = 20;
- write_hex32(&g_Drawer, reg);
- g_Drawer.x = 0;
- g_Drawer.y = 0;
- if (reg & 1 << 28) { uart_string("Connector ID Status Change\n"); }
- if (reg & 1 << 27) { uart_string("LPM Transaction Received Interrupt\n"); }
- if (reg & 1 << 26) { uart_string("Periodic TxFIFO Empty\n"); }
- if (reg & 1 << 25) { uart_string("Host Channels Interrupt\n");
- }
- if (reg & 1 << 24) { *USB_HOST_HPRT |= 1 << 1; //clear host port interrupt
- uart_string("Host Port Interrupt\n"); }
- if (reg & 1 << 6) { uart_string("Global IN Non-periodic NAK Effective\n"); }
- if (reg & 1 << 5) { uart_string("Non-periodic TxFIFO Empty\n"); }
- if (reg & 1 << 4) { uart_string("Host and Device RxFIFO Non-Empty (RxFLvl) \n"); }
- if (reg & 1 << 3) { uart_string("Host and Device Start of Frame\n"); }
- if (reg & 1 << 2) { uart_string("OTG Interrupt\n"); }
- if (reg & 1 << 1) { uart_string("Mode Mismatch Interrupt\n"); }
}
} else if (source & (1 << 3)) {
c_timer();
diff --git a/src/drivers/usb.c b/src/drivers/usb.c
deleted file mode 100644
index ea264cb..0000000
--- a/src/drivers/usb.c
+++ /dev/null
@@ -1,327 +0,0 @@
-#include "../drivers/uart.h"
-#include "../drivers/usb.h"
-#include "../sys/core.h"
-
-#define DRIVERS_USB_C
-unsigned char usb_buffer0[256] = {0};
-unsigned char usb_buffer1[256] = {0};
-unsigned char usb_buffer3[256] = {0};
-
-void my_memcpy(void *dest, void *src, size_t n) {
- char *src_char = (char *)src;
- char *dest_char = (char *)dest;
- for (size_t i=0; i<n; i++) {
- dest_char[i] = src_char[i];
- }
-}
-
-static void *my_memset(void *s, int c, size_t n)
-{
- const uint8_t uc = c % 0xff;
- uint8_t *p = (uint8_t *)s;
-
- while (n-- > 0)
- *p++ = uc;
-
- return (s);
-}
-
-static void txrx_control_msg(uint8_t txlen)
-{
- // send setup & control packet
- // set dma buffer
- *USB_HOST_HCDMA0 = (uint64_t) usb_buffer0;
- *USB_HOST_HCDMA0 |= 0xC0000000;
- // HCTSIZ0.Pid = 2'd3 (SETUP) , HCTSIZ0.PktCnt = 10'h1 , HCTSIZ0.XferSize = 18'd8
- *USB_HOST_HCTSIZ0 = 3 << 29 | 1 << 19 | txlen;
- // HCCAR1.ChEna = 1'b1
- *USB_HOST_HCCHAR0 |= 1<<31;
-
- // recieve control packet
- // set dma buffer
- *USB_HOST_HCDMA1 = (uint64_t) usb_buffer1;
- *USB_HOST_HCDMA1 |= 0xC0000000;
- // HCTSIZ1.Pid = 2'd2 (DATA1) , HCTSIZ1.PktCnt = 10'h1 , HCTSIZ1.XferSize = 18'd64
- *USB_HOST_HCTSIZ1 = 2 << 29 | 1 << 19 | 64;
- // HCCAR1.ChEna = 1'b1
- *USB_HOST_HCCHAR1 |= 1<<31;
-}
-
-void usbhost_id(void)
-{
- uart_string("USB_CORE_GUID ");
- uart_hex(*USB_CORE_GUID);
- uart_string("\nUSB_CORE_GSNPSID ");
- uart_hex(*USB_CORE_GSNPSID);
- uart_char('\n');
-}
-
-void usbhost_start(void)
-{
- // USB Host power on
- // HPRT.PrtPwr = 1'b1 -> HPRT.PrtRst = 1'b1 -> wait 60msec -> HPRT.PrtRst = 1'b0
- *USB_HOST_HPRT |= 1 << 12;
- *USB_HOST_HPRT |= 1 << 8;
- delay(0x100000);
- *USB_HOST_HPRT &= ~(1 << 8);
-
- // enable irq
- // GAHBCFG.GlblIntrMsk = 1'b1
- // GINTMSK.ConIDStsChngMsk = 1'b1, GINTMSK.PrtIntMsk = 1'b1, GINTMSK.SofMsk = 1'b1
- *USB_CORE_GAHBCFG |= 1;
- *USB_CORE_GINTMSK = 1 << 28 | 1 << 24 | 0 << 3;
-
- // port enable and retry detect
- // HPRT.PrtPwr = 1'b1, HPRT.PrtEnChng = 1'b1, HPRT.PrtConnDet = 1'b1
- *USB_HOST_HPRT = 1 << 12 | 1 << 3 | 1 << 1;
-
- // enable channel irq
- // HAINTMASK.HAINTMsk = 16'h3
- // HCINTMSK0.XferComplMsk = 1'b1
- *USB_HOST_HAINTMSK |= 0x3;
- *USB_HOST_HCINTMSK0 |= 1;
- *USB_HOST_HCINTMSK1 |= 1;
-
- // HCCAR1.EPDir = 1'b0 (OUT) / 1'b01(IN), HCCAR1.MPS = 11'h40
- *USB_HOST_HCCHAR0 |= 0x40; // OUT
- *USB_HOST_HCCHAR1 |= 1 << 15 | 0x40; // IN
-}
-
-void usbhost_poll_intr(void)
-{
- uint8_t dev = 2;
-
- my_memset(usb_buffer3, 0, 256);
-
- // HCCAR3.EPType = 2'b11 (Interupt), HCCAR3.EPDir = 1'b01(IN), HCCAR3.MPS = 11'h40
- *USB_HOST_HCCHAR3 |= 3 << 18 | 1 << 15 | 1 << 11 | 0x40; // IN
- *USB_HOST_HCCHAR3 |= dev << 22 ;
-
- // recieve interrupt transfer
- // set dma buffer
- *USB_HOST_HCDMA3 = (uint64_t) usb_buffer3;
- *USB_HOST_HCDMA3 |= 0xC0000000;
- // HCTSIZ1.Pid = 2'd2 (DATA1) , HCTSIZ1.PktCnt = 10'h1 , HCTSIZ1.XferSize = 18'd64
- *USB_HOST_HCTSIZ3 = 2 << 29 | 1 << 19 | 64;
- // HCCAR1.ChEna = 1'b1
- *USB_HOST_HCCHAR3 |= 1<<31;
-
- uart_string("HUB INT ");
- for (int i = 0; i < 2; i++) {
- uart_hex(usb_buffer3[i]);
- uart_char(' ');
- }
- uart_char('\n');
-}
-
-static void prepare_control_msg(void)
-{
- my_memset(usb_buffer0, 0, 256);
- my_memset(usb_buffer1, 0, 256);
-
- // HCCAR1.EPDir = 1'b0 (OUT) / 1'b01(IN), HCCAR1.MPS = 11'h40
- *USB_HOST_HCCHAR0 |= 0x40; // OUT
- *USB_HOST_HCCHAR1 |= 1 << 15 | 0x40; // IN
-
- //clear dev
- *USB_HOST_HCCHAR0 &= ~(0x7f << 22);
- *USB_HOST_HCCHAR1 &= ~(0x7f << 22);
-}
-
-
-void usbhost_get_descriptor(uint8_t dev, uint8_t descriptor_type, bool is_hub)
-{
- prepare_control_msg();
-
- *USB_HOST_HCCHAR0 |= dev << 22;
- *USB_HOST_HCCHAR1 |= dev << 22;
-
- // build packet
- my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
- .Type = is_hub ? 0xA0 : 0x80, // DEVICE_TO_HOST | STANDARD | DEVICE
- .Request = 0x06, // GET_DESCRIPTOR
- .Value = descriptor_type << 8 | 0x00, // descriptor.type = 0x01, decriptor.index = 0x00
- .Index = 0,
- .Length = 64,
- }, 8);
-
- txrx_control_msg(8);
-}
-
-void usbhost_get_portstatus(uint8_t dev, uint8_t port, bool is_hub)
-{
- prepare_control_msg();
-
- *USB_HOST_HCCHAR0 |= dev << 22;
- *USB_HOST_HCCHAR1 |= dev << 22;
-
- // build packet
- my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
- .Type = is_hub ? 0xA3 : 0x80, // DEVICE_TO_HOST | CLASS or STANDARD | DEVICE
- .Request = 0x00, // GET_STATUS
- .Index = port,
- .Length = 4,
- }, 8);
-
- txrx_control_msg(8);
-
- uart_string("PORT STATUS ");
- uart_10(port);
- for (int i = 0; i < 4; i++) {
- uart_hex(usb_buffer1[i]);
- uart_char(' ');
- }
- uart_char('\n');
-}
-
-void usbhost_set_address(uint8_t address)
-{
- prepare_control_msg();
-
- // build packet
- my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
- .Type = 0,
- .Request = 5, // Set address request
- .Value = address, // Address to set
- }, 8);
-
- txrx_control_msg(8);
-}
-
-void usbhost_set_config(uint8_t dev, uint8_t config)
-{
- prepare_control_msg();
-
- *USB_HOST_HCCHAR0 |= dev << 22;
- *USB_HOST_HCCHAR1 |= dev << 22;
-
- // build packet
- my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
- .Type = 0,
- .Request = 9, // Set config
- .Value = config, // Address to set
- .Length = 0,
- }, 8);
-
- txrx_control_msg(8);
-}
-
-void usbhost_set_portfeature(uint8_t dev, uint8_t port, uint16_t feature)
-{
- prepare_control_msg();
-
- *USB_HOST_HCCHAR0 |= dev << 22;
- *USB_HOST_HCCHAR1 |= dev << 22;
-
- // build packet
- my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
- .Type = 0x23, // ??
- .Request = 0x03, // SET_FEATURE
- .Value = (uint16_t)feature, // Feature we are changing
- .Index = port,
- .Length = 0,
- }, 8);
-
- txrx_control_msg(8);
-}
-
-void usbhost_clear_portfeature(uint8_t dev, uint8_t port, uint16_t feature)
-{
- prepare_control_msg();
-
- *USB_HOST_HCCHAR0 |= dev << 22;
- *USB_HOST_HCCHAR1 |= dev << 22;
-
- // build packet
- my_memcpy(usb_buffer0, &(struct UsbDeviceRequest) {
- .Type = 0x23, // ??
- .Request = 0x01, // CLEAR_FEATURE
- .Value = feature,
- .Index = port,
- .Length = 0,
- }, 8);
-
- txrx_control_msg(8);
-}
-
-void usb_trig(void)
-{
- usbhost_id();
- usbhost_start();
-
- uart_string("GET DEVICE_DESCRIPTOR\n");
- usbhost_get_descriptor(0, 0x01, false);
- for (int i = 0; i < 18; i++) {
- uart_hex(usb_buffer1[i]);
- uart_char(' ');
- }
- uart_char('\n');
-
- uart_string("SET ADDRESS 2\n");
- usbhost_set_address(2);
-
- uart_string("GET CONFIG_DESCRIPTOR\n");
- usbhost_get_descriptor(2, 0x02, false);
- for (int i = 0; i < 18; i++) {
- uart_hex(usb_buffer1[i]);
- uart_char(' ');
- }
- uart_char('\n');
-
- uart_string("SET CONFIG 1\n");
- usbhost_set_config(2, 1);
-
- uart_string("GET HUB_DESCRIPTOR\n");
- usbhost_get_descriptor(2, 41, true);
- for (int i = 0; i < 18; i++) {
- uart_hex(usb_buffer1[i]);
- uart_char(' ');
- }
- uart_char('\n');
- uart_string("Hub device 0 has ");
- uart_10(usb_buffer1[2]);
- uart_string(" ports\n");
-
- usbhost_get_portstatus(2, 0, false);
- usbhost_get_portstatus(2, 1, true);
- usbhost_clear_portfeature(2, 1, 0x0010);
- usbhost_get_portstatus(2, 1, true);
-
- uart_string("SET PORT 1 POWER ON\n");
- usbhost_set_portfeature(2, 1, 0x0008);
- usbhost_get_portstatus(2, 1, true);
-
- delay(0x100000);
-
- uart_string("CLEAR PORT FEATURE\n");
- usbhost_clear_portfeature(2, 1, 0x0010);
- // usbhost_get_portstatus(2, 1, true);
- // usbhost_poll_intr();
-
- uart_string("SET PORT 1 RESET\n");
- usbhost_set_portfeature(2, 1, 0x0004);
- // usbhost_poll_intr();
-
- uart_string("CLEAR PORT FEATURE\n");
- usbhost_clear_portfeature(2, 1, 0x0014);
- usbhost_clear_portfeature(2, 1, 0x0011);
- // usbhost_get_portstatus(2, 1, true);
- // usbhost_poll_intr();
-
- uart_string("GET DEVICE_DESCRIPTOR\n");
- usbhost_get_descriptor(0, 0x01, false);
- for (int i = 0; i < 18; i++) {
- uart_hex(usb_buffer1[i]);
- uart_char(' ');
- }
- uart_string("\n");
-
- usbhost_set_address(3);
- uart_string("GET CONFIG_DESCRIPTOR\n");
- usbhost_get_descriptor(3, 0x02, false);
- for (int i = 0; i < 18; i++) {
- uart_hex(usb_buffer1[i]);
- uart_char(' ');
- }
- uart_string("\n");
-}
diff --git a/src/drivers/usb.h b/src/drivers/usb.h
deleted file mode 100644
index e1aae5f..0000000
--- a/src/drivers/usb.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef DRIVERS_USB_H
-#define DRIVERS_USB_H
-
-#ifndef DRIVERS_USB_C
-extern unsigned char usb_buffer0[256];
-extern unsigned char usb_buffer1[256];
-#endif
-
-#define size_t unsigned int
-#define bool unsigned char
-#define uint8_t unsigned char
-#define uint16_t unsigned short
-#define uint32_t unsigned long
-#define uint64_t unsigned long long
-#define true 1
-#define false 0
-
-#define USB_BASE 0x3F980000
-//CORE
-#define USB_CORE_GAHBCFG ((volatile uint32_t *)(0x8 + USB_BASE))
-#define USB_CORE_GINTSTS ((volatile uint32_t *)(0x14 + USB_BASE))
-#define USB_CORE_GINTMSK ((volatile uint32_t *)(0x18 + USB_BASE))
-#define USB_CORE_GUID ((volatile uint32_t *)(0x3C + USB_BASE))
-#define USB_CORE_GSNPSID ((volatile uint32_t *)(0x40 + USB_BASE))
-//HOST
-#define USB_HOST_HCFG ((volatile uint32_t *)(0x400 + USB_BASE))
-#define USB_HOST_HAINTMSK ((volatile uint32_t *)(0x418 + USB_BASE))
-#define USB_HOST_HPRT ((volatile uint32_t *)(0x440 + USB_BASE))
-//CHANNEL
-#define USB_HOST_HCCHAR0 ((volatile uint32_t *)(0x500 + USB_BASE))
-#define USB_HOST_HCINTMSK0 ((volatile uint32_t *)(0x50C + USB_BASE))
-#define USB_HOST_HCTSIZ0 ((volatile uint32_t *)(0x510 + USB_BASE))
-#define USB_HOST_HCDMA0 ((volatile uint32_t *)(0x514 + USB_BASE))
-#define USB_HOST_HCCHAR1 ((volatile uint32_t *)(0x520 + USB_BASE))
-#define USB_HOST_HCINTMSK1 ((volatile uint32_t *)(0x52C + USB_BASE))
-#define USB_HOST_HCTSIZ1 ((volatile uint32_t *)(0x530 + USB_BASE))
-#define USB_HOST_HCDMA1 ((volatile uint32_t *)(0x534 + USB_BASE))
-
-#define USB_HOST_HCCHAR2 ((volatile uint32_t *)(0x540 + USB_BASE))
-#define USB_HOST_HCINTMSK2 ((volatile uint32_t *)(0x54C + USB_BASE))
-#define USB_HOST_HCTSIZ2 ((volatile uint32_t *)(0x550 + USB_BASE))
-#define USB_HOST_HCDMA2 ((volatile uint32_t *)(0x554 + USB_BASE))
-#define USB_HOST_HCCHAR3 ((volatile uint32_t *)(0x560 + USB_BASE))
-#define USB_HOST_HCINTMSK3 ((volatile uint32_t *)(0x56C + USB_BASE))
-#define USB_HOST_HCTSIZ3 ((volatile uint32_t *)(0x570 + USB_BASE))
-#define USB_HOST_HCDMA3 ((volatile uint32_t *)(0x574 + USB_BASE))
-
-struct UsbDeviceRequest {
- uint8_t Type;
- uint8_t Request;
- uint16_t Value;
- uint16_t Index;
- uint16_t Length;
-} __attribute__((__packed__));
-
-void send_packet(void);
-void usbhost_start(void);
-void usbhost_id(void);
-void usbhost_get_descriptor(uint8_t dev, uint8_t descriptor_type, bool is_hub);
-void usbhost_get_portstatus(uint8_t dev, uint8_t port, bool is_hub);
-void usbhost_set_address(uint8_t address);
-void usbhost_set_config(uint8_t dev, uint8_t config);
-void usbhost_set_portfeature(uint8_t dev, uint8_t port, uint16_t feature);
-void usbhost_clear_portfeature(uint8_t dev, uint8_t port, uint16_t feature);
-void usbhost_poll_intr(void);
-void usb_trig(void);
-
-#endif
diff --git a/src/sys/core.c b/src/sys/core.c
index 78d95b9..178b5f8 100644
--- a/src/sys/core.c
+++ b/src/sys/core.c
@@ -1,6 +1,5 @@
#include "../cpu/irq.h"
#include "../drivers/uart.h"
-#include "../drivers/usb.h"
#include "../graphics/lfb.h"
#include "../graphics/drawer.h"
#include "../lib/mem.h"
@@ -28,10 +27,6 @@ void sysinit() {
// Enable UART GPU IRQ
store32(1<<25, IRQ_ENABLE2);
- // Enable USB Interrupt
- store32(1<<9, IRQ_ENABLE1);
- usbhost_start();
-
// Enable Timer
// As an IRQ
store32(1<<0, IRQ_BASIC_ENABLE);
@@ -133,6 +128,4 @@ void postinit() {
}
write_string(&g_Drawer, "\n> ");
-
- usb_trig();
}
diff --git a/src/sys/core.h b/src/sys/core.h
index 1a85537..74bac74 100644
--- a/src/sys/core.h
+++ b/src/sys/core.h
@@ -113,11 +113,6 @@ enum
PM_RSTC_RESET = 0x00000102,
};
-#define bool unsigned char
-#define uint8_t unsigned char
-#define uint16_t unsigned short
-#define uint32_t unsigned long
-
void sysinit();
void postinit();
--
cgit v1.2.1