Fix driver implementation

network/rtl8139/Makefile

@@ -1,83 +1,22 @@
-# Config file
+# Config files
 include ../../../Makefile.conf
-
-FILENAME = rtl8139.drv
-
-CC = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)gcc
-CPP = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)g++
-LD = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)ld
-AS = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)as
-OBJDUMP = ../../../$(COMPILER_PATH)/$(COMPILER_ARCH)objdump
+include ../../config.mk
 
 S_SOURCES = $(shell find ./ -type f -name '*.S')
 C_SOURCES = $(shell find ./ -type f -name '*.c')
 CPP_SOURCES = $(shell find ./ -type f -name '*.cpp')
 HEADERS = $(sort $(dir $(wildcard ../../include/*)))
-OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
+OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(S_SOURCES:.S=.o)
 STACK_USAGE_OBJ = $(C_SOURCES:.c=.su) $(CPP_SOURCES:.cpp=.su)
-INCLUDE_DIR = ../../include
 
-LIBS := ../../out/dcrt0.o -L../../out -ldriver
-
-LDFLAGS := 															\
-	-fPIC -fPIE -pie												\
-	-Wl,--no-dynamic-linker,-ztext,--no-warn-rwx-segment 			\
-	-nostdlib -nodefaultlibs -nolibc  								\
-	-zmax-page-size=0x1000											\
-	-Wl,-Map file.map -shared -fvisibility=hidden
-
-WARNCFLAG = -Wall -Wextra
-
-CFLAGS := -I$(INCLUDE_DIR) -fvisibility=hidden
-
-ifeq ($(OSARCH), amd64)
-
-CFLAGS += -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
-
-else ifeq ($(OSARCH), i386)
-
-CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
-		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i386 -pipe -msoft-float -fno-builtin
-
-else ifeq ($(OSARCH), aarch64)
-
-CFLAGS += -pipe -fno-builtin -fPIC
-
-endif
-
-ifeq ($(DEBUG), 1)
-	CFLAGS += -DDEBUG -ggdb3 -O0 -fdiagnostics-color=always -fstack-usage
-ifeq ($(OSARCH), amd64)
-	CFLAGS += -fverbose-asm
-endif
-ifneq ($(OSARCH), aarch64)
-	CFLAGS += -fstack-check
-endif
-	LDFLAGS += -ggdb3 -O0
-endif
+FILENAME = rtl8139.drv
 
 build: $(FILENAME)
 	mv $(FILENAME) ../../out/$(FILENAME)
 
 $(FILENAME): $(OBJ)
 	$(info Linking $@)
-	$(CC) $(LDFLAGS) $(OBJ) $(LIBS) -o $@
-
-%.o: %.c $(HEADERS)
-	$(info Compiling $<)
-	$(CC) $(CFLAGS) $(WARNCFLAG) -std=c17 -c $< -o $@
-
-%.o: %.cpp $(HEADERS)
-	$(info Compiling $<)
-	$(CPP) $(CFLAGS) $(WARNCFLAG) -std=c++20 -fno-exceptions -fno-rtti -c $< -o $@
-
-%.o: %.S
-	$(info Compiling $<)
-	$(AS) -o $@ $<
+	$(CC) $(DRIVER_LDFLAGS) $(OBJ) ../../out/dcrt0.o -L../../out -lkernel -o $@
 
 clean:
 	rm -f file.map $(OBJ) $(STACK_USAGE_OBJ)

network/rtl8139/main.c

@@ -27,5 +27,5 @@ int DriverProbe() { return cxx_Probe(); }
 DriverInfo("rtl8139",
 		   "Realtek RTL8139 Network Driver",
 		   "EnderIce2",
-		   "0.1",
+		   0, 0, 1,
 		   "GPLv3");

network/rtl8139/rtl8139.cpp

@@ -20,7 +20,7 @@
 #include <regs.h>
 #include <base.h>
 #include <pci.h>
-#include <net.h>
+#include <network.h>
 #include <io.h>
 
 #include "rtl8139.hpp"
@@ -99,7 +99,11 @@ public:
 			uint16_t dataSz = *(data + 1);
 			data += 2;
 
-			ReportNetworkPacket(ID, data, dataSz);
+			// ReportNetworkPacket(ID, data, dataSz);
+			/* FIXME: Implement */
+			KernelLog("FIXME: Received packet");
+			(void)data;
+			(void)dataSz;
 
 			/* Update CAPR */
 #define RX_READ_PTR_MASK (~0x3)
@@ -169,7 +173,7 @@ public:
 };
 
 RTL8139Device *Drivers[4] = {nullptr};
-dev_t AudioID[4] = {0};
+dev_t NetID[4] = {(dev_t)-1};
 
 #define OIR(x) OIR_##x
 #define CREATE_OIR(x) \
@@ -180,20 +184,40 @@ CREATE_OIR(1);
 CREATE_OIR(2);
 CREATE_OIR(3);
 
-int drvOpen(dev_t, dev_t, int, mode_t) { return 0; }
-int drvClose(dev_t, dev_t) { return 0; }
-size_t drvRead(dev_t, dev_t, uint8_t *, size_t, off_t) { return 0; }
+int __fs_Open(struct Inode *, int, mode_t) { return 0; }
+int __fs_Close(struct Inode *) { return 0; }
+ssize_t __fs_Read(struct Inode *, void *, size_t, off_t) { return 0; }
 
-size_t drvWrite(dev_t, dev_t min, uint8_t *Buffer, size_t Size, off_t)
+ssize_t __fs_Write(struct Inode *Node, const void *Buffer, size_t Size, off_t)
 {
-	return Drivers[AudioID[min]]->write(Buffer, Size);
+	return Drivers[NetID[Node->GetMinor()]]->write((uint8_t *)Buffer, Size);
 }
 
-int drvIoctl(dev_t, dev_t min, unsigned long Request, void *Argp)
+int __fs_Ioctl(struct Inode *Node, unsigned long Request, void *Argp)
 {
-	return Drivers[AudioID[min]]->ioctl((NetIoctl)Request, Argp);
+	return Drivers[NetID[Node->GetMinor()]]->ioctl((NetIoctl)Request, Argp);
 }
 
+const struct InodeOperations NetOps = {
+	.Lookup = nullptr,
+	.Create = nullptr,
+	.Remove = nullptr,
+	.Rename = nullptr,
+	.Read = __fs_Read,
+	.Write = __fs_Write,
+	.Truncate = nullptr,
+	.Open = __fs_Open,
+	.Close = __fs_Close,
+	.Ioctl = __fs_Ioctl,
+	.ReadDir = nullptr,
+	.MkDir = nullptr,
+	.RmDir = nullptr,
+	.SymLink = nullptr,
+	.ReadLink = nullptr,
+	.Seek = nullptr,
+	.Stat = nullptr,
+};
+
 PCIArray *Devices;
 EXTERNC int cxx_Panic()
 {
@@ -216,10 +240,10 @@ EXTERNC int cxx_Probe()
 							PCI_END};
 	uint16_t DeviceIDs[] = {0x8139, /* RTL8139 */
 							PCI_END};
-	Devices = FindPCIDevices(VendorIDs, DeviceIDs);
+	Devices = GetPCIDevices(VendorIDs, DeviceIDs);
 	if (Devices == nullptr)
 	{
-		Log("No RTL8139 device found.");
+		KernelLog("No RTL8139 device found.");
 		return -ENODEV;
 	}
 	return 0;
@@ -240,11 +264,8 @@ EXTERNC int cxx_Initialize()
 
 		if (Drivers[Count]->IsInitialized())
 		{
-			dev_t ret = RegisterNetDevice(ddt_Network,
-										  drvOpen, drvClose,
-										  drvRead, drvWrite,
-										  drvIoctl);
-			AudioID[Count] = ret;
+			dev_t ret = RegisterDevice(NETWORK_TYPE_ETHERNET, &NetOps);
+			NetID[Count] = ret;
 			Drivers[Count]->ID = ret;
 
 			/* FIXME: bad code */
@@ -273,7 +294,7 @@ EXTERNC int cxx_Initialize()
 
 	if (Count == 0)
 	{
-		Log("No valid RTL8139 device found.");
+		KernelLog("No valid RTL8139 device found.");
 		return -EINVAL;
 	}
 
@@ -294,5 +315,11 @@ EXTERNC int cxx_Finalize()
 		ctx = (PCIArray *)ctx->Next;
 	}
 
+	for (size_t i = 0; i < sizeof(NetID) / sizeof(dev_t); i++)
+	{
+		if (NetID[i] != (dev_t)-1)
+			UnregisterDevice(NetID[i]);
+	}
+
 	return 0;
 }