Added multiboot smbios table

idk why, but grub doesn't seem to find a smbios table in qemu. I tried
a local dump of my pc's smbios but this doesn't work either.. *thinking*

2 files changed, 9 insertions, 75 deletions

diff --git a/src/kernel/smbios/smbios.c b/src/kernel/smbios/smbios.c
index f2650bb..5e48ffa 100644
--- a/src/kernel/smbios/smbios.c
+++ b/src/kernel/smbios/smbios.c
@@ -1,53 +1,9 @@
-#include <kernel/graphics/vesa.h>
 #include <stddef.h>
+#include <kernel/multiboot.h>
+#include <kernel/system.h>
 #include <kernel/smbios/smbios.h>
 
-struct smbios_entry *smbios = 0;
-
-size_t smbios_table_len(struct smbios_header *header)
-{
-	size_t i;
-	const char *strtab = (char *)header + header->length;
-	for (i = 1; strtab[i - 1] != '\0' || strtab[i] != '\0'; i++)
-		;
-	return header->length + i + 1;
+void smbios_init(struct multiboot_tag_smbios *tag) {
+	log("%s", ((struct smbios_0 *)tag->tables)->vendor);
+	return;
 }
-
-struct smbios_entry *get_smbios()
-{
-	if (smbios != 0)
-		return smbios;
-
-	char *mem = (char *)0xF0000;
-	int length, i;
-	unsigned char checksum;
-	while ((unsigned int)mem < 0x100000) {
-		if (mem[0] == '_' && mem[1] == 'S' && mem[2] == 'M' && mem[3] == '_') {
-			length = mem[5];
-			checksum = 0;
-			for (i = 0; i < length; i++) {
-				checksum += mem[i];
-			}
-			if (checksum == 0)
-				break;
-		}
-		mem += 16;
-	}
-
-	if ((unsigned int)mem == 0x100000) {
-		warn("No SMBIOS found!");
-		return 0;
-	}
-
-	smbios = (struct smbios_entry *)mem;
-	if (smbios->major_version != 2)
-		warn("Non-supported SMBIOS version");
-	smbios_table((struct smbios_header *)mem);
-	return smbios;
-}
-
-void smbios_table(struct smbios_header *header)
-{
-	// struct smbios_0 *table = (struct smbios_0 *) (header + sizeof(struct smbios_header));
-	// log("\n\n %d", table->bios_version);
-}
\ No newline at end of file
diff --git a/src/kernel/smbios/smbios.h b/src/kernel/smbios/smbios.h
index 4485f3e..1d0765a 100644
--- a/src/kernel/smbios/smbios.h
+++ b/src/kernel/smbios/smbios.h
@@ -1,28 +1,8 @@
 #ifndef MELVIX_SMBIOS_H
 #define MELVIX_SMBIOS_H
 
-struct smbios_header {
-	uint8_t type;
-	uint8_t length;
-	uint16_t handle;
-};
-
-struct smbios_entry {
-	int8_t signature[4];
-	uint8_t checksum;
-	uint8_t length;
-	uint8_t major_version;
-	uint8_t minor_version;
-	uint8_t max_structure_size;
-	int8_t entry_point_revision;
-	int8_t formatted_area[5];
-	int8_t entry_point_signature[5];
-	uint8_t checksum2;
-	uint16_t table_length;
-	uint32_t table_address;
-	uint16_t number_of_structures;
-	uint8_t bcd_revision;
-};
+#include <stdint.h>
+#include <kernel/multiboot.h>
 
 struct smbios_0 {
 	char *vendor;
@@ -42,8 +22,6 @@ struct smbios_1 {
 	uint8_t wakeup_type;
 };
 
-struct smbios_entry *get_smbios();
-
-void smbios_table(struct smbios_header *header);
+void smbios_init(struct multiboot_tag_smbios *tag);
 
-#endif
\ No newline at end of file
+#endif