tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-06-07 08:14:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update IntEntrySet calls to use new IntEntryAlloc system.

Browse Source
This commit is contained in:
TomAwezome 2021-12-04 05:07:38 -05:00
parent 102d8afafe
commit b6496c9378
5 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Demo/Lectures/InterruptDemo.CC
View File

@ -1,5 +1,5 @@
//This is the software interrupt num //This is the software interrupt num
//we will use. See $LK,"Software Int's",A="MN:I_WAKE"$ for //we will use. See $LK,"Software Int's",A="MN:I_USER"$ for
//picking a num. Nums are subject to change. //picking a num. Nums are subject to change.
#define I_F_UNARY_MINUS I_USER #define I_F_UNARY_MINUS I_USER

13
src/Demo/MultiCore/Interrupts.CC
View File

@ -6,18 +6,21 @@ interrupt U0 IntBeepOn()
interrupt U0 IntBeepOff() interrupt U0 IntBeepOff()
{ {
*(dev.uncached_alias+LAPIC_EOI)(U32 *) = 0; *(dev.uncached_alias + LAPIC_EOI)(U32 *) = 0;
Sound; Sound;
} }
U0 IntTest() U0 IntTest()
{//Modify interrupt descriptor table use by all cores. {//Modify interrupt descriptor table use by all cores.
IntEntrySet(I_USER, &IntBeepOn, IDTET_TRAP); I64 int_on = IntEntryAlloc,
IntEntrySet(I_USER + 1, &IntBeepOff, IDTET_TRAP); int_off = IntEntryAlloc;
IntEntrySet(int_on, &IntBeepOn, IDTET_TRAP);
IntEntrySet(int_off, &IntBeepOff, IDTET_TRAP);
//Issue interupt to core1 //Issue interupt to core1
MPInt(I_USER, 1); MPInt(int_on, 1);
Sleep(1000); Sleep(1000);
MPInt(I_USER + 1, 1); MPInt(int_off, 1);
} }
IntTest; IntTest;

5
src/Home/Net/Drivers/E1000.CC
View File

@ -442,11 +442,6 @@ U0 PCIInterruptsReroute(I64 base)
U0 E1000InterruptsSetup() U0 E1000InterruptsSetup()
{ // .. ? { // .. ?
/* IntEntrySet(I_E1000_0, &E1000IRQ);
IntEntrySet(I_E1000_1, &E1000IRQ);
IntEntrySet(I_E1000_2, &E1000IRQ);
IntEntrySet(I_E1000_3, &E1000IRQ);
PCIInterruptsReroute(I_E1000_0);*/
I64 irq, i; I64 irq, i;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)

5
src/Home/Net/Drivers/PCNet.CC
View File

@ -617,11 +617,6 @@ U0 PCIInterruptsReroute(I64 base)
U0 PCNetInterruptsSetup() U0 PCNetInterruptsSetup()
{ // todo: comments explaining process { // todo: comments explaining process
/* IntEntrySet(I_PCNET0, &PCNetIRQ);
IntEntrySet(I_PCNET1, &PCNetIRQ);
IntEntrySet(I_PCNET2, &PCNetIRQ);
IntEntrySet(I_PCNET3, &PCNetIRQ);
PCIInterruptsReroute(I_PCNET0);*/
I64 irq, i; I64 irq, i;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)

16
src/Home/Net/Utilities/Net.HH
View File

@ -20,24 +20,10 @@
#define IP_ADDRESS_LENGTH 4 #define IP_ADDRESS_LENGTH 4
/* PCNet reroutes PCI interrupts to software. See $LK,"PCNet",A="FF:C:/Home/Net/Drivers/PCNet.CC,irq = "$. /* NICs reroute PCI interrupts to software. See $LK,"PCNet",A="FF:C:/Home/Net/Drivers/PCNet.CC,irq = "$.
Net Handler interrupt is generated whenever an entry is Net Handler interrupt is generated whenever an entry is
pushed to the NetQueue. See $LK,"NetHandler",A="FF:C:/Home/Net/Utilities/NetHandler.CC,I_NETHANDLER"$. */ pushed to the NetQueue. See $LK,"NetHandler",A="FF:C:/Home/Net/Utilities/NetHandler.CC,I_NETHANDLER"$. */
/*
#define I_PCNET0 I_USER + 0
#define I_PCNET1 I_USER + 1
#define I_PCNET2 I_USER + 2
#define I_PCNET3 I_USER + 3
#define I_E1000_0 I_USER + 0
#define I_E1000_1 I_USER + 1
#define I_E1000_2 I_USER + 2
#define I_E1000_3 I_USER + 3
#define I_NETHANDLER I_USER + 4
*/
DefinePrint("I_NETHANDLER", "%d", IntEntryAlloc); DefinePrint("I_NETHANDLER", "%d", IntEntryAlloc);
#define INT_DEST_CPU 0 #define INT_DEST_CPU 0