diff options
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/mouse.c | 4 | ||||
| -rw-r--r-- | driver/pci.c | 7 | ||||
| -rw-r--r-- | driver/serial.c | 2 | ||||
| -rw-r--r-- | driver/vesa.c | 13 |
4 files changed, 12 insertions, 14 deletions
diff --git a/driver/mouse.c b/driver/mouse.c index 28acf53..e37b017 100644 --- a/driver/mouse.c +++ b/driver/mouse.c @@ -97,7 +97,7 @@ void mouse_init() void mouse_log() { - //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%02x / %02x / %02x ",mouse_byte[0], mouse_byte[1],mouse_byte[2]); + //log(FOOLOS_MODULE_NAME,5,"%02x / %02x / %02x ",mouse_byte[0], mouse_byte[1],mouse_byte[2]); //TODO: ignore last packet for 4packets mouse and resync if you get out of sync if(mouse_byte[0]&0x80||mouse_byte[0]&0x40)return; //skip packet on overflow @@ -126,7 +126,7 @@ void mouse_log() if(mouse_x>800)mouse_x=800; if(mouse_y>600)mouse_y=600; - //log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%d / %d / %02x ",mouse_x, mouse_y,mouse_byte[2]); + //log(FOOLOS_MODULE_NAME,5,"%d / %d / %02x ",mouse_x, mouse_y,mouse_byte[2]); if (mouse_byte[0] & 1)vesa_put_rect(mouse_x,600-mouse_y,10,10,0x00ffff); //else vesa_put_rect(mouse_x,600-mouse_y,10,10,0x0000ff); PutFont('X', mouse_x,600-mouse_y, 0xff0000); diff --git a/driver/pci.c b/driver/pci.c index a8cd68b..7ad5daa 100644 --- a/driver/pci.c +++ b/driver/pci.c @@ -3,7 +3,6 @@ #include "kernel/kernel.h" #include "asm/x86.h" #include "e1000.h" -#include "lib/logger/log.h" // logger facilities #define PCI_CONFIG_DATA 0xCFC #define PCI_CONFIG_ADDRESS 0xCF8 @@ -66,7 +65,7 @@ void test_bar(uint8_t bus, uint8_t slot, uint8_t offset) pciConfigSet(bus,slot,0,offset,(bar_high<<16)+bar_low); - log("e1000",FOOLOS_LOG_INFO,"%s bar: (0x%x 0x%x) size: 0x%x" ,bar_low&1?"i/o":"mem",bar_high, bar_low, size); + log("e1000",5,"%s bar: (0x%x 0x%x) size: 0x%x" ,bar_low&1?"i/o":"mem",bar_high, bar_low, size); } @@ -80,7 +79,7 @@ uint16_t pciCheck(uint8_t bus, uint8_t slot) if ((vendor = pciConfigReadWord(bus,slot,0,0)) != 0xFFFF) { device = pciConfigReadWord(bus,slot,0,2); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"[%d,%d]: vendor: 0x%x / device: 0x%x",bus,slot,vendor,device); + log(FOOLOS_MODULE_NAME,5,"[%d,%d]: vendor: 0x%x / device: 0x%x",bus,slot,vendor,device); // check for: E1000 (82540EM). PCI Ethernet Controller if(vendor==0x8086&&device==0x100e) @@ -112,7 +111,7 @@ uint16_t pciCheck(uint8_t bus, uint8_t slot) void pci_init() { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"scanning bus"); + log(FOOLOS_MODULE_NAME,5,"scanning bus"); // todo: recurse on pci to pci bridges! // todo: support multiple pci host controllers! // (check more funcitons of device 0:0) diff --git a/driver/serial.c b/driver/serial.c index 178c9bc..6fb206f 100644 --- a/driver/serial.c +++ b/driver/serial.c @@ -1,5 +1,5 @@ #define FOOLOS_MODULE_NAME "serial" -#include "asm/serial.h" +#include "driver/serial.h" #include "asm/x86.h" // provides x86_inb() and x86_outb() diff --git a/driver/vesa.c b/driver/vesa.c index b8c03ec..d57174f 100644 --- a/driver/vesa.c +++ b/driver/vesa.c @@ -4,7 +4,6 @@ #include "kernel/mem.h" #include "vesa.h" -#include "lib/logger/log.h" // logger facilities #include "lib/printf/printf.h" #define FOOLOS_MODULE_NAME "vesa" @@ -139,18 +138,18 @@ uint32_t vesa_init(vbeinfo *info,vbemodeinfo *mode,foolfont *rawfont) console_lines=24; // vesa info - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"vbe version: 0x%x / video mode ptr: 0x%x 0x%x", + log(FOOLOS_MODULE_NAME,5,"vbe version: 0x%x / video mode ptr: 0x%x 0x%x", info->VbeVersion, info->VideoModePtr[1], info->VideoModePtr[0]); // vesa info on selected mode: - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"colors r:%d 0x%x g:%d 0x%x b:%d 0x%x", + log(FOOLOS_MODULE_NAME,5,"colors r:%d 0x%x g:%d 0x%x b:%d 0x%x", mode->red_position,mode->red_mask, mode->green_position,mode->green_mask, mode->blue_position,mode->blue_mask); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"res: %d * %d / banks: %d / attr: 0x%x", + log(FOOLOS_MODULE_NAME,5,"res: %d * %d / banks: %d / attr: 0x%x", mode->Xres, mode->Yres, mode->banks, mode->attributes); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"bpp: %d / physbase: 0x%x", + log(FOOLOS_MODULE_NAME,5,"bpp: %d / physbase: 0x%x", mode->bpp,mode->physbase); // vesa modes @@ -160,7 +159,7 @@ uint32_t vesa_init(vbeinfo *info,vbemodeinfo *mode,foolfont *rawfont) while(*modeptr!=0xffff&&*modeptr!=0) { - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"mode supported : 0x%X", (*modeptr)); + log(FOOLOS_MODULE_NAME,5,"mode supported : 0x%X", (*modeptr)); modeptr++; } #endif @@ -316,7 +315,7 @@ void vesa_init_doublebuff() int blocks=800*600*2/4096+1; physbase=VbeModeInfoBlock->physbase; buffer=pmmngr_alloc_blocks(blocks); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"Init buffer of %d blocks at 0x%08X",blocks,buffer); + log(FOOLOS_MODULE_NAME,5,"Init buffer of %d blocks at 0x%08X",blocks,buffer); VbeModeInfoBlock->physbase=buffer; } |