diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-09-01 11:16:07 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-09-01 11:16:07 +0200 |
| commit | 2efcb6caf52a73bafb3332ee5e0468ef4c1cd9a9 (patch) | |
| tree | e3ed5d3c2e87d68af1524a5fb7c7c12fc01c7525 | |
| parent | 3737daa88e744cba341e08eef4a2bf607bd8ff00 (diff) | |
fixed some gcc warnings
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | kernel/e1000.c | 1 | ||||
| -rw-r--r-- | kernel/floppy.c | 6 | ||||
| -rw-r--r-- | kernel/interrupts.c | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -26,7 +26,7 @@ USB_STICK=/dev/sdf ############ flags ############ -CFLAGS=-ffreestanding -std=gnu99 -m32 -fno-asynchronous-unwind-tables -O0 +CFLAGS=-ffreestanding -std=gnu99 -m32 -fno-asynchronous-unwind-tables -O0 # -Werror ############ source and object files ############ diff --git a/kernel/e1000.c b/kernel/e1000.c index 1ef8fb3..99194be 100644 --- a/kernel/e1000.c +++ b/kernel/e1000.c @@ -1,5 +1,4 @@ void init_e1000() { - scr_put_string_nl("e1000: initializing E1000 Intel PCI Ethernet Controller (TODO)"); } diff --git a/kernel/floppy.c b/kernel/floppy.c index 9e27214..e6d2d11 100644 --- a/kernel/floppy.c +++ b/kernel/floppy.c @@ -23,6 +23,10 @@ #define FLPY_SECTORS_PER_TRACK 18 +void flpydsk_send_command (uint8_t cmd); +void flpydsk_wait_irq (); +void flpydsk_check_int (uint32_t* st0, uint32_t* cyl); + static volatile int _CurrentDrive=0; static volatile uint8_t _FloppyDiskIRQ = 0; @@ -169,14 +173,12 @@ void flpydsk_motor_on() //x86_outb (FLPYDSK_DOR, FLPYDSK_DOR_MASK_DRIVE0_MOTOR | FLPYDSK_DOR_MASK_RESET); x86_outb (FLPYDSK_DOR, 0x1c); sleep(20); - scr_put_string_nl("ok"); } void flpydsk_motor_off() { log(FOOLOS_MODULE_NAME,FOOLOS_LOG_DEBUG,"stopping motor..."); x86_outb (FLPYDSK_DOR, 0x0c); //x86_outb (FLPYDSK_DOR,FLPYDSK_DOR_MASK_RESET); - scr_put_string_nl("ok"); } int flpydsk_calibrate (uint32_t drive) { diff --git a/kernel/interrupts.c b/kernel/interrupts.c index 3404228..df8e673 100644 --- a/kernel/interrupts.c +++ b/kernel/interrupts.c @@ -4,6 +4,8 @@ #include "../lib/logger/log.h" // logger facilities #define FOOLOS_MODULE_NAME "interrupts" +void int_install_ir(int irq, uint16_t flags, uint16_t sel, void *addr); + // the interrupt descriptor table static struct int_desc { |