src/drivers/acpi.c src/include/drivers/acpi.h @@ -19,7 +19,7 @@ com4: enabled=0 i440fxsupport: enabled=1 usb1: enabled=0 #sb16: wavemode=3, wave=op.wav, loglevel=5, log=sb16.log, dmatimer=600000 -sb16: midimode=3, midi=a.midi, wavemode=3, wave=a.wav, loglevel=5, log=sb16.log, dmatimer=600000 +#sb16: midimode=3, midi=a.midi, wavemode=3, wave=a.wav, loglevel=5, log=sb16.log, dmatimer=600000 floppy_bootsig_check: disabled=0 vga_update_interval: 40000 vga: extension=vbe bochsrc @@ -31,6 +31,7 @@ #include <drivers/kb.h> #include <drivers/sb16.h> #include <drivers/smbios.h> +#include <drivers/acpi.h> #include <irq.h> #include <page.h> #include <mm.h> @@ -79,6 +80,12 @@ void init(unsigned long magic, unsigned long addr) { irq_install(); kprintf("%k[ok]\n", VIDEO_FG_LIGHT_GREEN); + kprintf("Initialising ACPI:\t"); + if(acpi_init() == ACPI_SUCCESS) + kprintf("%k[ok]\n", VIDEO_FG_LIGHT_GREEN); + else + kprintf("%k[failed]\n", VIDEO_FG_RED); + void *prepage = kmalloc(8); kprintf("Pre-paging, pointer: %x\n", prepage); kfree(prepage); @@ -107,10 +114,6 @@ void init(unsigned long magic, unsigned long addr) { __asm__ __volatile__("sti"); - kprintf("Installing system clock:\t"); - timer_install(); - kprintf("%k[ok]\n", VIDEO_FG_LIGHT_GREEN); - kprintf("Installing keyboard:\t"); keyboard_install(); kprintf("%k[ok]\n", VIDEO_FG_LIGHT_GREEN); @@ -125,6 +128,11 @@ void init(unsigned long magic, unsigned long addr) { kprintf("%k[Version %d.%d OK]\n", VIDEO_FG_LIGHT_GREEN, first, second); } + kprintf("Installing system clock:\t"); + timer_install(); + kprintf("%k[ok]\n", VIDEO_FG_LIGHT_GREEN); + + kprintf("Probing for SMBIOS: "); smbios_entry_t *smbios = smbios_init(); if(smbios) src/arch/i386/boot/init.c @@ -1,3 +1,3 @@ -ext_files = ["video/tvbe.c"] +ext_files = ["video/vga.c"] eval File.open("../rant.rb").read src/drivers/Rantfile @@ -24,6 +24,7 @@ #include <drivers/pit.h> #include <lib/kprintf.h> #include <procio.h> +#include <drivers/sb16.h> uint32_t pit_ticks = 0; src/drivers/pit.c @@ -1,5 +1,28 @@ #include <drivers/smbios.h> #include <asm/stddef.h> +#include <lib/kprintf.h> + +typedef struct { + uint8_t type; + uint8_t length; + uint16_t handle; +} smbios_header_t; + +typedef struct { + uint8_t type; + uint8_t length; + uint16_t handle; + uint8_t vendor; + uint8_t bios_version; + uint16_t bios_start_addr; + uint8_t bios_release_date; + uint8_t bios_rom_size; + uint8_t bios_char_ext[2]; + uint8_t system_bios_maj_ver; + uint8_t system_bios_min_ver; + uint8_t controller_firmware_maj_ver; + uint8_t controller_firmware_min_ver; +} smbios_type0_t; smbios_entry_t *smbios_init(void){ char *mem = (char *)SMBIOS_START_ADDR; @@ -8,7 +31,11 @@ smbios_entry_t *smbios_init(void){ break; mem++; } - if(mem == SMBIOS_END_ADDR) + if((unsigned int)mem == SMBIOS_END_ADDR) return NULL; - return (smbios_entry_t *)mem; + + smbios_entry_t *smbios = (smbios_entry_t *)mem; + smbios_header_t *header = (smbios_header_t *)smbios->table_address; + + return smbios; } src/drivers/smbios.c @@ -26,5 +26,6 @@ size_t strlen(const char *); void *memset(void *, int, size_t); void *memcpy(void *, const void *, size_t); +int memcmp(const void *, const void *, size_t); #endif /* __LIB_STRING_H__ */ src/include/lib/string.h @@ -100,3 +100,15 @@ void *memcpy(void *dest, const void *src, size_t n) { return dest; } +int memcmp(const void *s1, const void *s2, size_t n){ + const unsigned char *us1 = (const unsigned char *)s1; + const unsigned char *us2 = (const unsigned char *)s2; + while (n-- != 0){ + if (*us1 != *us2) + return (*us1 < *us2) ? -1 : +1; + us1++; + us2++; + } + return 0; +} + src/lib/string.c 7c44ab36bde36f3d5b40fa038d13f2eeda01ddec Andrew Etches seadog@mehmoo.com http://github.com/seadog/kaiser/commit/dd19c8369300892bfb111703a6b629bab0e24442 dd19c8369300892bfb111703a6b629bab0e24442 2009-03-31T17:17:45-07:00 2009-03-31T17:17:45-07:00 Added some basic ACPI stuff, and removed sb16 from bochsrc for the time being 87d6feb047f0d5b35d21764840b5528a01b34bf4 Andrew Etches seadog@mehmoo.com