Spexeah/Asuro
4
1 Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

git-svn-id: https://spexeah.com:8443/svn/Asuro@352 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

Browse Source
This commit is contained in:
kieron committed 2018-04-05 19:17:46 +00:00
1 parent 91d6c8a608
commit 78910b6fcc
27 files changed
+253 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/driver/E1000.pas
+227
View File
File diff suppressed because it is too large. Load diff
src/driver/PCI.pas
+1
View File
@@ -313,6 +313,7 @@ begin
DevID^.id1:= device.class_code;
DevID^.id2:= device.subclass_class;
DevID^.id3:= device.prog_if;
DevID^.id4:= device.vendor_id;
DevID^.ex:= nil;
console.writestring('PCI: Found Device: ');
src/driver/USB.pas
+2
View File
@@ -110,6 +110,7 @@ begin
UHCI_ID.id1:= $0000000C;
UHCI_ID.id2:= $00000003;
UHCI_ID.id3:= $00000000;
UHCI_ID.id4:= $FFFFFFFF;
UHCI_ID.ex:= nil;
OHCI_ID.Bus:= biPCI;
@@ -117,6 +118,7 @@ begin
OHCI_ID.id1:= $0000000C;
OHCI_ID.id2:= $00000003;
OHCI_ID.id3:= $00000010;
OHCI_ID.id4:= $FFFFFFFF;
OHCI_ID.ex:= nil;
drivermanagement.register_driver('USB-UHCI Driver', @UHCI_ID, @loadUHCI);
src/driver/keyboard.pas
+1
View File
@@ -78,6 +78,7 @@ begin
devid.id1:= 0;
devid.id2:= 0;
devid.id3:= 0;
devid.id4:= 0;
devid.ex:= nil;
drivermanagement.register_driver_ex('PS/2 Keyboard', @devid, @load, true);
console.writestringln('PS/2 KEYBOARD: INIT END.');
src/driver/mouse.pas
+1
View File
@@ -122,6 +122,7 @@ begin
devid.id1:= 0;
devid.id2:= 0;
devid.id3:= 0;
devid.id4:= 0;
devid.ex:= nil;
drivermanagement.register_driver_ex('PS/2 Mouse', @devid, @load, true);
console.writestringln('PS/2 MOUSE: INIT END.');
src/driver/testdriver.pas
+1
View File
@@ -24,6 +24,7 @@ begin
devID.id1:= $00000006; { CLASS }
devID.id2:= $00000000; { SUBCLASS }
devID.id3:= $00000000; { PROGIF }
devID.id4:= idANY;
devID.ex:= nil; { NO EXTENDED INFO }
drivermanagement.register_driver('DUMMY DRIVER', @devID, @load);
end;
src/drivermanagement.pas
+16 -7
View File
@@ -26,12 +26,13 @@ type
TBusIdentifier = (biUnknown, biPCI, biUSB, bii2c, biPCIe, biANY);
PDeviceIdentifier = ^TDeviceIdentifier;
TDeviceIdentifier = record
TDeviceIdentifier = record
Bus : TBusIdentifier;
id0 : uInt32;
id1 : uInt32;
id2 : uInt32;
id3 : uint32;
id4 : uint32;
ex : PDevEx;
end;
@@ -93,8 +94,8 @@ begin
if Drv^.Loaded then begin
console.writeint(i);
console.writestring(') ');
console.writestring(Drv^.Driver_Name);
console.writestring(' [');
console.writestringln(Drv^.Driver_Name);
console.writestring('[');
writeBusType(Drv^.Identifier^.Bus);
console.writestring(' - ID:');
console.writeHex(Drv^.Identifier^.id0);
@@ -104,6 +105,8 @@ begin
console.writeHex(Drv^.Identifier^.id2);
console.writestring('-');
console.writeHex(Drv^.Identifier^.id3);
console.writestring('-');
console.writeHex(Drv^.Identifier^.id4);
ex:= Drv^.Identifier^.ex;
while ex <> nil do begin
console.writestring('-');
@@ -130,8 +133,8 @@ begin
console.writeint(i);
if Drv^.Loaded then console.writestring('L');
console.writestring(') ');
console.writestring(Drv^.Driver_Name);
console.writestring(' [');
console.writestringln(Drv^.Driver_Name);
console.writestring('[');
writeBusType(Drv^.Identifier^.Bus);
console.writestring(' - ID:');
console.writeHex(Drv^.Identifier^.id0);
@@ -141,6 +144,8 @@ begin
console.writeHex(Drv^.Identifier^.id2);
console.writestring('-');
console.writeHex(Drv^.Identifier^.id3);
console.writestring('-');
console.writeHex(Drv^.Identifier^.id4);
ex:= Drv^.Identifier^.ex;
while ex <> nil do begin
console.writestring('-');
@@ -165,8 +170,8 @@ begin
while Dv <> nil do begin
console.writeint(i);
console.writestring(') ');
console.writestring(Dv^.Device_Name);
console.writestring(' [');
console.writestringln(Dv^.Device_Name);
console.writestring('[');
writeBusType(Dv^.Identifier^.Bus);
console.writestring(' - ID:');
console.writeHex(Dv^.Identifier^.id0);
@@ -176,6 +181,8 @@ begin
console.writeHex(Dv^.Identifier^.id2);
console.writestring('-');
console.writeHex(Dv^.Identifier^.id3);
console.writestring('-');
console.writeHex(Dv^.Identifier^.id4);
ex:= Dv^.Identifier^.ex;
while ex <> nil do begin
console.writestring('-');
@@ -212,6 +219,7 @@ begin
New_DevID^.id1:= DeviceID^.id1;
New_DevID^.id2:= DeviceID^.id2;
New_DevID^.id3:= DeviceID^.id3;
New_DevID^.id4:= DeviceID^.id4;
root_ex:= nil;
if DeviceID^.ex <> nil then begin
root_ex:= PDevEx(kalloc(sizeof(TDevEx)));
@@ -243,6 +251,7 @@ begin
identifiers_match:= identifiers_match and ((i1^.id1 = i2^.id1) OR (i1^.id1 = $FFFFFFFF) OR (i2^.id1 = $FFFFFFFF));
identifiers_match:= identifiers_match and ((i1^.id2 = i2^.id2) OR (i1^.id2 = $FFFFFFFF) OR (i2^.id2 = $FFFFFFFF));
identifiers_match:= identifiers_match and ((i1^.id3 = i2^.id3) OR (i1^.id3 = $FFFFFFFF) OR (i2^.id3 = $FFFFFFFF));
identifiers_match:= identifiers_match and ((i1^.id4 = i2^.id4) OR (i1^.id4 = $FFFFFFFF) OR (i2^.id4 = $FFFFFFFF));
ll1:= i1^.ex;
ll2:= i2^.ex;
while true do begin
src/kernel.pas
+4 -3
View File
@@ -34,7 +34,8 @@ uses
strings,
AHCI,
USB,
testdriver;
testdriver,
E1000;
procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall;
@@ -128,7 +129,7 @@ begin
pci.init();
console.writestringln('DRIVERS: INIT END.');
console.writestring('AHCI TEST');
{console.writestring('AHCI TEST');
console.writestringln('A');
atmp:= puint32(kalloc(sizeof(1024*128)));
console.writestringln('B');
@@ -141,7 +142,7 @@ begin
AHCI.read(0, $5, $1, 32, atmp);
console.writestringln('F');
console.writeint(atmp^);
console.writestringln('G');
console.writestringln('G');}
console.writestringln('');
console.setdefaultattribute(console.combinecolors(Green, Black));