Fix KUSB enough to compile, move KUSB defines to KernelA.HH.

src/Kernel/KUSB.ZC

@@ -1,117 +1,106 @@
-
+
-#define USBP_CMD 0x00
+#define USBP_CMD 0x00
-#define USBP_STS 0x02
+#define USBP_STS 0x02
-#define USBP_INTR 0x04
+#define USBP_INTR 0x04
-#define USBP_FRNUM 0x06
+#define USBP_FRNUM 0x06
-#define USBP_FRBASEADD 0x08
+#define USBP_FRBASEADD 0x08
-#define USBP_SOFMOD 0x0C
+#define USBP_SOFMOD 0x0C
-#define USBP_PORTSC0 0x10
+#define USBP_PORTSC0 0x10
-#define USBP_PORTSC1 0x12
+#define USBP_PORTSC1 0x12
-#define USB_NUM 16
+#define USB_NUM 16
-
+
-class CUSBTD	//Not implemented
+//USB Pkt ID's
-{
+#define PID_OUT 0xE1
-	U32 td[4];
+#define PID_IN 0x69
-};
+#define PID_SOF 0xA5
-
+#define PID_SETUP 0x2D
-class CUSB	//Not implemented
+#define PID_DATA0 0xC3
-{
+#define PID_DATA1 0x4B
-	U8 num,	//USB dev num
+#define PID_DATA2 0x87
-	bus, dev, fun;
+#define PID_MDATA 0x0F
-	U16 ports, pad;
+#define PID_ACK 0xD2
-	U32 *frame_lst;
+#define PID_NAK 0x5A
-};
+#define PID_STALL 0x1E
-
+#define PID_NYET 0x96
-//USB Pkt ID's
+#define PID_PRE 0x3C
-#define PID_OUT 0xE1
+#define PID_ERR 0x3C
-#define PID_IN 0x69
+#define PID_SPLIT 0x78
-#define PID_SOF 0xA5
+#define PID_PING 0xB4
-#define PID_SETUP 0x2D
+
-#define PID_DATA0 0xC3
+//USB Std Rqsts
-#define PID_DATA1 0x4B
+#define RQ_GET_STAT 0x0
-#define PID_DATA2 0x87
+#define RQ_CLR_FEAT 0x1
-#define PID_MDATA 0x0F
+#define RQ_SET_FEAT 0x3
-#define PID_ACK 0xD2
+#define RQ_SET_ADDR 0x5
-#define PID_NAK 0x5A
+#define RQ_SET_DESC 0x7
-#define PID_STALL 0x1E
+#define RQ_GET_CFG 0x8
-#define PID_NYET 0x96
+#define RQ_SET_CFG 0x9
-#define PID_PRE 0x3C
+#define RQ_GET_INTERFACE 0xA
-#define PID_ERR 0x3C
+#define RQ_SET_INTERFACE 0xB
-#define PID_SPLIT 0x78
+#define RQ_SYNC_FRAME 0xC
-#define PID_PING 0xB4
+
-
+I64 sys_num_usb = 0;
-//USB Std Rqsts
+CUSB sys_usb_devs[USB_NUM];
-#define RQ_GET_STAT 0x0
+MemSet(sys_usb_devs, 0, USB_NUM * sizeof(CUSB));
-#define RQ_CLR_FEAT 0x1
+
-#define RQ_SET_FEAT 0x3
+U0 USBInitOne(I64 b, I64 d, I64 f)
-#define RQ_SET_ADDR 0x5
+{
-#define RQ_SET_DESC 0x7
+	CUSB *u;
-#define RQ_GET_CFG 0x8
+	if (sys_num_usb < USB_NUM && PCIReadU16(b, d, f, 0) == 0x8086)
-#define RQ_SET_CFG 0x9
+	{
-#define RQ_GET_INTERFACE 0xA
+		u = &sys_usb_devs[sys_num_usb++];
-#define RQ_SET_INTERFACE 0xB
+		u->num = sys_num_usb;
-#define RQ_SYNC_FRAME 0xC
+		u->bus = b;
-
+		u->dev = d;
-I64 sys_num_usb = 0;
+		u->fun = f;
-CUSB sys_usb_devs[USB_NUM];
+		u->ports = PCIReadU32(b, d, f, 0x20) & ~0x1F;
-MemSet(sys_usb_devs, 0, USB_NUM * sizeof(CUSB));
+	}
-
+}
-U0 USBInitOne(I64 b, I64 d, I64 f)
+
-{
+U0 USBEndAll()
-	CUSB *u;
+{
-	if (sys_num_usb < USB_NUM && PCIReadU16(b, d, f, 0) == 0x8086)
+	sys_num_usb = 0;
-	{
+}
-		u = &sys_usb_devs[sys_num_usb++];
+
-		u->num = sys_num_usb;
+U0 USBInitAll()	//This is only valid for my ICH10 dev
-		u->bus = b;
+{
-		u->dev = d;
+	if (sys_num_usb)
-		u->fun = f;
+		USBEndAll;
-		u->ports = PCIReadU32(b, d, f, 0x20) & ~0x1F;
+	USBInitOne(0, 29, 0);
-	}
+	USBInitOne(0, 29, 1);
-}
+	USBInitOne(0, 29, 2);
-
+	USBInitOne(0, 29, 3);
-U0 USBEndAll()
+	USBInitOne(0, 26, 0);
-{
+	USBInitOne(0, 26, 1);
-	sys_num_usb = 0;
+	USBInitOne(0, 26, 2);
-}
+}
-
+
-U0 USBInitAll()	//This is only valid for my ICH10 dev
+CUSBTD *USBAllocTD()
-{
+{
-	if (sys_num_usb)
+//	return MAllocAligned(sizeof(CUSBTD), 0x10, dev.uncached_heap);
-		USBEndAll;
+	return MAllocAligned(sizeof(CUSBTD), 0x10, dev.uncached_alias + sys_task->code_heap);
-	USBInitOne(0, 29, 0);
+}
-	USBInitOne(0, 29, 1);
+
-	USBInitOne(0, 29, 2);
+U0 USBFreeTD(CUSBTD *tmptd)
-	USBInitOne(0, 29, 3);
+{
-	USBInitOne(0, 26, 0);
+	Free(tmptd);
-	USBInitOne(0, 26, 1);
+}
-	USBInitOne(0, 26, 2);
+
-}
+U32 *USBAllocFrameLst(I64 usb_num, I64 size)
-
+{
-CUSBTD *USBAllocTD()
+	//aligned to 0x1000
-{
+	CUSB *u;
-	return MAllocAligned(sizeof(CUSBTD), 0x10, dev.uncached_heap);
+	if (0 <= usb_num < sys_num_usb)
-}
+	{
-
+		u = &sys_usb_devs[usb_num];
-U0 USBFreeTD(CUSBTD *tmptd)
+		Free(u->frame_lst);
-{
+//		u->frame_lst = MAllocAligned(size * sizeof(U32), 0x1000, dev.uncached_heap);
-	Free(tmptd);
+		u->frame_lst = MAllocAligned(size * sizeof(U32), 0x1000, dev.uncached_alias + sys_task->code_heap);
-}
+		OutU16(u->ports + USBP_CMD, 0);	//Stop
-
+		OutU16(u->ports + USBP_FRNUM, 0);
-U32 *USBAllocFrameLst(I64 usb_num, I64 size)
+		OutU32(u->ports + USBP_FRBASEADD, u->frame_lst);
-{
+		return u->frame_lst;
-	//aligned to 0x1000
+	}
-	CUSB *u;
+
-	if (0 <= usb_num < sys_num_usb)
+	return NULL;
-	{
+}
-		u = &sys_usb_devs[usb_num];
-		Free(u->frame_lst);
-		u->frame_lst = MAllocAligned(size * sizeof(U32), 0x1000, dev.uncached_heap);
-		OutU16(u->ports + USBP_CMD, 0);	//Stop
-		OutU16(u->ports + USBP_FRNUM, 0);
-		OutU32(u->ports + USBP_FRBASEADD, u->frame_lst);
-		return u->frame_lst;
-	}
-
-	return NULL;
-}

src/Kernel/KernelA.HH

@@ -3016,6 +3016,62 @@ class CAtapiModeWriteList
 #define ATAR0_CMD 	7
 #define ATAR1_CTRL	2
 
+#help_index "Devices;USB"
+class CUSBTD	//Not implemented
+{
+	U32 td[4];
+};
+
+class CUSB	//Not implemented
+{
+	U8 num,	//USB dev num
+	bus, dev, fun;
+	U16 ports, pad;
+	U32 *frame_lst;
+};
+
+#define USBP_CMD 0x00
+#define USBP_STS 0x02
+#define USBP_INTR 0x04
+#define USBP_FRNUM 0x06
+#define USBP_FRBASEADD 0x08
+#define USBP_SOFMOD 0x0C
+#define USBP_PORTSC0 0x10
+#define USBP_PORTSC1 0x12
+#define USB_NUM 16
+
+//USB Pkt ID's
+#define PID_OUT 0xE1
+#define PID_IN 0x69
+#define PID_SOF 0xA5
+#define PID_SETUP 0x2D
+#define PID_DATA0 0xC3
+#define PID_DATA1 0x4B
+#define PID_DATA2 0x87
+#define PID_MDATA 0x0F
+#define PID_ACK 0xD2
+#define PID_NAK 0x5A
+#define PID_STALL 0x1E
+#define PID_NYET 0x96
+#define PID_PRE 0x3C
+#define PID_ERR 0x3C
+#define PID_SPLIT 0x78
+#define PID_PING 0xB4
+
+//USB Std Rqsts
+#define RQ_GET_STAT 0x0
+#define RQ_CLR_FEAT 0x1
+#define RQ_SET_FEAT 0x3
+#define RQ_SET_ADDR 0x5
+#define RQ_SET_DESC 0x7
+#define RQ_GET_CFG 0x8
+#define RQ_SET_CFG 0x9
+#define RQ_GET_INTERFACE 0xA
+#define RQ_SET_INTERFACE 0xB
+#define RQ_SYNC_FRAME 0xC
+
+
+
 #help_index "File/FileNames"
 #define FILEMASK_JIT	"*.ZC*;*.HH*"
 #define FILEMASK_AOT	"*.ZC*;*.HH*;*.PRJ*"