Added vscode config

This commit is contained in:
Alex 2023-03-09 04:57:07 +02:00
parent 6c65f6f970
commit 1f4751f90f
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 167 additions and 47 deletions

120
.vscode/c_cpp_properties.json vendored Normal file
View File

@ -0,0 +1,120 @@
{
"configurations": [
{
"name": "Fennix x64 (Linux, GCC, debug)",
"includePath": [
"${workspaceFolder}/include",
"${workspaceFolder}/include/**"
],
"defines": [
"__debug_vscode__",
"KERNEL_NAME=\"Fennix\"",
"KERNEL_VERSION=\"1.0\"",
"GIT_COMMIT=\"0000000000000000000000000000000000000000\"",
"GIT_COMMIT_SHORT=\"0000000\"",
"a64",
"DEBUG=\"1\""
],
"compilerPath": "${workspaceFolder}/../tools/cross/bin/amd64-elf-gcc",
"cStandard": "c17",
"cppStandard": "c++20",
"intelliSenseMode": "gcc-x64",
"configurationProvider": "ms-vscode.makefile-tools",
"compilerArgs": [
// Compiler flags
"-fPIC",
"-fPIE",
"-pie",
"-mno-80387",
"-mno-mmx",
"-mno-3dnow",
"-mno-red-zone",
"-mno-sse",
"-mno-sse2",
"-march=x86-64",
"-pipe",
"-ffunction-sections",
"-msoft-float",
"-fno-builtin",
// C++ flags
"-fexceptions",
// Linker flags
"-fPIC",
"-fPIE",
"-pie",
"-Wl,-eDriverEntry",
"-Wl,-static,--no-dynamic-linker,-ztext,--no-warn-rwx-segment",
"-nostdlib",
"-nodefaultlibs",
"-nolibc",
"-zmax-page-size=0x1000",
"-static",
// VSCode flags
"-ffreestanding",
"-nostdinc",
"-nostdinc++"
]
},
{
"name": "Fennix x32 (Linux, GCC, debug)",
"includePath": [
"${workspaceFolder}/include/**"
],
"defines": [
"__debug_vscode__",
"KERNEL_NAME=\"Fennix\"",
"KERNEL_VERSION=\"1.0\"",
"GIT_COMMIT=\"0000000000000000000000000000000000000000\"",
"GIT_COMMIT_SHORT=\"0000000\"",
"a32",
"DEBUG=\"1\""
],
"compilerPath": "${workspaceFolder}/../tools/cross/bin/i686-elf-gcc",
"cStandard": "c17",
"cppStandard": "c++20",
"intelliSenseMode": "gcc-x86",
"configurationProvider": "ms-vscode.makefile-tools",
"compilerArgs": [
// Compiler flags
"-fPIC",
"-fPIE",
"-pie",
"-mno-80387",
"-mno-mmx",
"-mno-3dnow",
"-mno-red-zone",
"-mno-sse",
"-mno-sse2",
"-march=i686",
"-pipe",
"-ffunction-sections",
"-msoft-float",
"-fno-builtin",
// C++ flags
"-fexceptions",
// Linker flags
"-fPIC",
"-fPIE",
"-pie",
"-Wl,-eDriverEntry",
"-Wl,-static,--no-dynamic-linker,-ztext,--no-warn-rwx-segment",
"-nostdlib",
"-nodefaultlibs",
"-nolibc",
"-zmax-page-size=0x1000",
"-static",
// VSCode flags
"-ffreestanding",
"-nostdinc",
"-nostdinc++"
]
}
],
"version": 4
}

View File

@ -192,7 +192,7 @@ TXDescriptor *TX[E1000_NUM_TX_DESC];
MediaAccessControl MAC; MediaAccessControl MAC;
InternetProtocol4 IP; InternetProtocol4 IP;
void OutCMD(uint16_t Address, uint32_t Value) void WriteCMD(uint16_t Address, uint32_t Value)
{ {
if (BAR.Type == 0) if (BAR.Type == 0)
mmioout32(BAR.MemoryBase + Address, Value); mmioout32(BAR.MemoryBase + Address, Value);
@ -203,7 +203,7 @@ void OutCMD(uint16_t Address, uint32_t Value)
} }
} }
uint32_t InCMD(uint16_t Address) uint32_t ReadCMD(uint16_t Address)
{ {
if (BAR.Type == 0) if (BAR.Type == 0)
return mmioin32(BAR.MemoryBase + Address); return mmioin32(BAR.MemoryBase + Address);
@ -220,14 +220,14 @@ uint32_t ReadEEPROM(uint8_t Address)
uint32_t temp = 0; uint32_t temp = 0;
if (EEPROMAvailable) if (EEPROMAvailable)
{ {
OutCMD(REG::EEPROM, (1) | ((uint32_t)(Address) << 8)); WriteCMD(REG::EEPROM, (1) | ((uint32_t)(Address) << 8));
while (!((temp = InCMD(REG::EEPROM)) & (1 << 4))) while (!((temp = ReadCMD(REG::EEPROM)) & (1 << 4)))
; ;
} }
else else
{ {
OutCMD(REG::EEPROM, (1) | ((uint32_t)(Address) << 2)); WriteCMD(REG::EEPROM, (1) | ((uint32_t)(Address) << 2));
while (!((temp = InCMD(REG::EEPROM)) & (1 << 1))) while (!((temp = ReadCMD(REG::EEPROM)) & (1 << 1)))
; ;
} }
Data = (uint16_t)((temp >> 16) & 0xFFFF); Data = (uint16_t)((temp >> 16) & 0xFFFF);
@ -279,18 +279,18 @@ void InitializeRX()
RX[i]->Status = 0; RX[i]->Status = 0;
} }
OutCMD(REG::TXDESCLO, (uint32_t)((uint64_t)Ptr >> 32)); WriteCMD(REG::TXDESCLO, (uint32_t)((uint64_t)Ptr >> 32));
OutCMD(REG::TXDESCHI, (uint32_t)((uint64_t)Ptr & 0xFFFFFFFF)); WriteCMD(REG::TXDESCHI, (uint32_t)((uint64_t)Ptr & 0xFFFFFFFF));
OutCMD(REG::RXDESCLO, (uint64_t)Ptr); WriteCMD(REG::RXDESCLO, (uint64_t)Ptr);
OutCMD(REG::RXDESCHI, 0); WriteCMD(REG::RXDESCHI, 0);
OutCMD(REG::RXDESCLEN, E1000_NUM_RX_DESC * 16); WriteCMD(REG::RXDESCLEN, E1000_NUM_RX_DESC * 16);
OutCMD(REG::RXDESCHEAD, 0); WriteCMD(REG::RXDESCHEAD, 0);
OutCMD(REG::RXDESCTAIL, E1000_NUM_RX_DESC - 1); WriteCMD(REG::RXDESCTAIL, E1000_NUM_RX_DESC - 1);
RXCurrent = 0; RXCurrent = 0;
OutCMD(REG::RCTRL, RCTL::EN | RCTL::SBP | RCTL::UPE | RCTL::MPE | RCTL::LBM_NONE | RTCL::RDMTS_HALF | RCTL::BAM | RCTL::SECRC | RCTL::BSIZE_8192); WriteCMD(REG::RCTRL, RCTL::EN | RCTL::SBP | RCTL::UPE | RCTL::MPE | RCTL::LBM_NONE | RTCL::RDMTS_HALF | RCTL::BAM | RCTL::SECRC | RCTL::BSIZE_8192);
} }
void InitializeTX() void InitializeTX()
@ -307,18 +307,18 @@ void InitializeTX()
TX[i]->Status = TSTA::DD; TX[i]->Status = TSTA::DD;
} }
OutCMD(REG::TXDESCHI, (uint32_t)((uint64_t)Ptr >> 32)); WriteCMD(REG::TXDESCHI, (uint32_t)((uint64_t)Ptr >> 32));
OutCMD(REG::TXDESCLO, (uint32_t)((uint64_t)Ptr & 0xFFFFFFFF)); WriteCMD(REG::TXDESCLO, (uint32_t)((uint64_t)Ptr & 0xFFFFFFFF));
OutCMD(REG::TXDESCLEN, E1000_NUM_TX_DESC * 16); WriteCMD(REG::TXDESCLEN, E1000_NUM_TX_DESC * 16);
OutCMD(REG::TXDESCHEAD, 0); WriteCMD(REG::TXDESCHEAD, 0);
OutCMD(REG::TXDESCTAIL, 0); WriteCMD(REG::TXDESCTAIL, 0);
TXCurrent = 0; TXCurrent = 0;
OutCMD(REG::TCTRL, TCTL::EN_ | TCTL::PSP | (15 << TCTL::CT_SHIFT) | (64 << TCTL::COLD_SHIFT) | TCTL::RTLC); WriteCMD(REG::TCTRL, TCTL::EN_ | TCTL::PSP | (15 << TCTL::CT_SHIFT) | (64 << TCTL::COLD_SHIFT) | TCTL::RTLC);
OutCMD(REG::TCTRL, 0b0110000000000111111000011111010); WriteCMD(REG::TCTRL, 0b0110000000000111111000011111010);
OutCMD(REG::TIPG, 0x0060200A); WriteCMD(REG::TIPG, 0x0060200A);
} }
int DriverEntry(void *Data) int DriverEntry(void *Data)
@ -359,9 +359,9 @@ int CallbackHandler(KernelCallback *Data)
BAR.MemoryBase = PCIBAR0 & (~15); BAR.MemoryBase = PCIBAR0 & (~15);
// Detect EEPROM // Detect EEPROM
OutCMD(REG::EEPROM, 0x1); WriteCMD(REG::EEPROM, 0x1);
for (int i = 0; i < 1000 && !EEPROMAvailable; i++) for (int i = 0; i < 1000 && !EEPROMAvailable; i++)
if (InCMD(REG::EEPROM) & 0x10) if (ReadCMD(REG::EEPROM) & 0x10)
EEPROMAvailable = true; EEPROMAvailable = true;
else else
EEPROMAvailable = false; EEPROMAvailable = false;
@ -374,15 +374,15 @@ int CallbackHandler(KernelCallback *Data)
MAC = GetMAC(); MAC = GetMAC();
// Start link // Start link
uint32_t cmdret = InCMD(REG::CTRL); uint32_t cmdret = ReadCMD(REG::CTRL);
OutCMD(REG::CTRL, cmdret | ECTRL::SLU); WriteCMD(REG::CTRL, cmdret | ECTRL::SLU);
for (int i = 0; i < 0x80; i++) for (int i = 0; i < 0x80; i++)
OutCMD(0x5200 + i * 4, 0); WriteCMD(0x5200 + i * 4, 0);
OutCMD(REG::IMASK, 0x1F6DC); WriteCMD(REG::IMASK, 0x1F6DC);
OutCMD(REG::IMASK, 0xFF & ~4); WriteCMD(REG::IMASK, 0xFF & ~4);
InCMD(0xC0); ReadCMD(0xC0);
InitializeRX(); InitializeRX();
InitializeTX(); InitializeTX();
@ -400,9 +400,9 @@ int CallbackHandler(KernelCallback *Data)
BAR.MemoryBase = PCIBAR0 & (~15); BAR.MemoryBase = PCIBAR0 & (~15);
// Detect EEPROM // Detect EEPROM
OutCMD(REG::EEPROM, 0x1); WriteCMD(REG::EEPROM, 0x1);
for (int i = 0; i < 1000 && !EEPROMAvailable; i++) for (int i = 0; i < 1000 && !EEPROMAvailable; i++)
if (InCMD(REG::EEPROM) & 0x10) if (ReadCMD(REG::EEPROM) & 0x10)
EEPROMAvailable = true; EEPROMAvailable = true;
else else
EEPROMAvailable = false; EEPROMAvailable = false;
@ -429,9 +429,9 @@ int CallbackHandler(KernelCallback *Data)
BAR.MemoryBase = PCIBAR0 & (~15); BAR.MemoryBase = PCIBAR0 & (~15);
// Detect EEPROM // Detect EEPROM
OutCMD(REG::EEPROM, 0x1); WriteCMD(REG::EEPROM, 0x1);
for (int i = 0; i < 1000 && !EEPROMAvailable; i++) for (int i = 0; i < 1000 && !EEPROMAvailable; i++)
if (InCMD(REG::EEPROM) & 0x10) if (ReadCMD(REG::EEPROM) & 0x10)
EEPROMAvailable = true; EEPROMAvailable = true;
else else
EEPROMAvailable = false; EEPROMAvailable = false;
@ -471,8 +471,8 @@ int CallbackHandler(KernelCallback *Data)
} }
case InterruptReason: case InterruptReason:
{ {
OutCMD(REG::IMASK, 0x1); WriteCMD(REG::IMASK, 0x1);
uint32_t status = InCMD(0xC0); uint32_t status = ReadCMD(0xC0);
UNUSED(status); UNUSED(status);
while ((RX[RXCurrent]->Status & 0x1)) while ((RX[RXCurrent]->Status & 0x1))
@ -483,7 +483,7 @@ int CallbackHandler(KernelCallback *Data)
RX[RXCurrent]->Status = 0; RX[RXCurrent]->Status = 0;
uint16_t OldRXCurrent = RXCurrent; uint16_t OldRXCurrent = RXCurrent;
RXCurrent = (RXCurrent + 1) % E1000_NUM_RX_DESC; RXCurrent = (RXCurrent + 1) % E1000_NUM_RX_DESC;
OutCMD(REG::RXDESCTAIL, OldRXCurrent); WriteCMD(REG::RXDESCTAIL, OldRXCurrent);
} }
break; break;
} }
@ -495,7 +495,7 @@ int CallbackHandler(KernelCallback *Data)
TX[TXCurrent]->Status = 0; TX[TXCurrent]->Status = 0;
uint8_t OldTXCurrent = TXCurrent; uint8_t OldTXCurrent = TXCurrent;
TXCurrent = (TXCurrent + 1) % E1000_NUM_TX_DESC; TXCurrent = (TXCurrent + 1) % E1000_NUM_TX_DESC;
OutCMD(REG::TXDESCTAIL, TXCurrent); WriteCMD(REG::TXDESCTAIL, TXCurrent);
while (!(TX[OldTXCurrent]->Status & 0xFF)) while (!(TX[OldTXCurrent]->Status & 0xFF))
; ;
break; break;
@ -503,23 +503,23 @@ int CallbackHandler(KernelCallback *Data)
case StopReason: case StopReason:
{ {
// Clearing Enable bit in Receive Control Register // Clearing Enable bit in Receive Control Register
uint64_t cmdret = InCMD(REG::RCTRL); uint64_t cmdret = ReadCMD(REG::RCTRL);
OutCMD(REG::RCTRL, cmdret & ~RCTL::EN); WriteCMD(REG::RCTRL, cmdret & ~RCTL::EN);
// Masking Interrupt Mask, Interrupt Throttling Rate & Interrupt Auto-Mask // Masking Interrupt Mask, Interrupt Throttling Rate & Interrupt Auto-Mask
OutCMD(REG::IMASK, 0x00000000); WriteCMD(REG::IMASK, 0x00000000);
OutCMD(REG::ITR, 0x00000000); WriteCMD(REG::ITR, 0x00000000);
OutCMD(REG::IAM, 0x00000000); WriteCMD(REG::IAM, 0x00000000);
// Clearing SLU bit in Device Control Register // Clearing SLU bit in Device Control Register
cmdret = InCMD(REG::CTRL); cmdret = ReadCMD(REG::CTRL);
OutCMD(REG::CTRL, cmdret & ~ECTRL::SLU); WriteCMD(REG::CTRL, cmdret & ~ECTRL::SLU);
// Clear the Interrupt Cause Read register by reading it // Clear the Interrupt Cause Read register by reading it
InCMD(REG::ICR); ReadCMD(REG::ICR);
// Powering down the device (?) // Powering down the device (?)
OutCMD(REG::CTRL, PCTRL::POWER_DOWN); WriteCMD(REG::CTRL, PCTRL::POWER_DOWN);
/* TODO: Stop link; further testing required */ /* TODO: Stop link; further testing required */
print("Driver stopped."); print("Driver stopped.");
break; break;