tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-25 23:10:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
TomAwezome 2022-12-23 02:11:32 -05:00
parent d02fb297a5
commit 9182775637
2 changed files with 162 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Kernel/KUSB.ZC
View file

@ -9,19 +9,6 @@
#define USBP_PORTSC1 0x12 #define USBP_PORTSC1 0x12
#define USB_NUM 16 #define USB_NUM 16
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;
};
//USB Pkt ID's //USB Pkt ID's
#define PID_OUT 0xE1 #define PID_OUT 0xE1
#define PID_IN 0x69 #define PID_IN 0x69
@ -90,7 +77,8 @@ U0 USBInitAll() //This is only valid for my ICH10 dev
CUSBTD *USBAllocTD() CUSBTD *USBAllocTD()
{ {
return MAllocAligned(sizeof(CUSBTD), 0x10, dev.uncached_heap); // return MAllocAligned(sizeof(CUSBTD), 0x10, dev.uncached_heap);
return MAllocAligned(sizeof(CUSBTD), 0x10, dev.uncached_alias + sys_task->code_heap);
} }
U0 USBFreeTD(CUSBTD *tmptd) U0 USBFreeTD(CUSBTD *tmptd)
@ -106,7 +94,8 @@ U32 *USBAllocFrameLst(I64 usb_num, I64 size)
{ {
u = &sys_usb_devs[usb_num]; u = &sys_usb_devs[usb_num];
Free(u->frame_lst); Free(u->frame_lst);
u->frame_lst = MAllocAligned(size * sizeof(U32), 0x1000, dev.uncached_heap); // u->frame_lst = MAllocAligned(size * sizeof(U32), 0x1000, dev.uncached_heap);
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_CMD, 0); //Stop
OutU16(u->ports + USBP_FRNUM, 0); OutU16(u->ports + USBP_FRNUM, 0);
OutU32(u->ports + USBP_FRBASEADD, u->frame_lst); OutU32(u->ports + USBP_FRBASEADD, u->frame_lst);

56
src/Kernel/KernelA.HH
View file

@ -3016,6 +3016,62 @@ class CAtapiModeWriteList
#define ATAR0_CMD 7 #define ATAR0_CMD 7
#define ATAR1_CTRL 2 #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" #help_index "File/FileNames"
#define FILEMASK_JIT "*.ZC*;*.HH*" #define FILEMASK_JIT "*.ZC*;*.HH*"
#define FILEMASK_AOT "*.ZC*;*.HH*;*.PRJ*" #define FILEMASK_AOT "*.ZC*;*.HH*;*.PRJ*"