diff options
| author | Miguel <m.i@gmx.at> | 2018-10-13 17:18:49 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-10-13 17:18:49 +0200 |
| commit | 5aeab1c853e487aa0042d5c32200d623efe908d3 (patch) | |
| tree | 51c810e0ce95c2b031b69999be2c0ab4244b2749 /driver | |
| parent | 279f3336a8f6b31ca38bdd272c73aebd68fa88fe (diff) | |
fontstuff et al.
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/e1000.c | 1 | ||||
| -rw-r--r-- | driver/keyboard.c | 2 | ||||
| -rw-r--r-- | driver/mouse.c | 2 | ||||
| -rw-r--r-- | driver/pci.c | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/driver/e1000.c b/driver/e1000.c index 5d0cbe6..7b4a7cb 100644 --- a/driver/e1000.c +++ b/driver/e1000.c @@ -525,6 +525,7 @@ struct netdev e1000_init(uint32_t base) return dev; } + uint32_t e1000_interrupt (uint32_t esp) { // if ( p_interruptContext->getInteruptNumber() == pciConfigHeader->getIntLine()+IRQ0) diff --git a/driver/keyboard.c b/driver/keyboard.c index b333b78..a153c9b 100644 --- a/driver/keyboard.c +++ b/driver/keyboard.c @@ -26,10 +26,8 @@ int hex_to_dec(char c) return c+10-'a'; } -extern struct netdev e1000_dev; static void put(uint8_t c) { -// syscall_generic(SYSCALL_WRITE,kb_stream, (char *)&c , 1, 0); compositor_kb_handle(c); } diff --git a/driver/mouse.c b/driver/mouse.c index 0c48a5f..c0e71d5 100644 --- a/driver/mouse.c +++ b/driver/mouse.c @@ -154,7 +154,7 @@ void mouse_action() if(mouse_x>=1920)mouse_x=1920-1; if(mouse_y>=1080)mouse_y=1080-1; - compositor_mouse_handle(mouse_x,1080-mouse_y, mouse_byte[0]); + compositor_mouse_handle(mouse_x,1080-mouse_y-1, mouse_byte[0]); } void mouse_handler(uint8_t byte)//struct regs *a_r) //struct regs *a_r (not used but just there) diff --git a/driver/pci.c b/driver/pci.c index a6d68c1..4d0ea3e 100644 --- a/driver/pci.c +++ b/driver/pci.c @@ -6,7 +6,7 @@ #define PCI_CONFIG_DATA 0xCFC #define PCI_CONFIG_ADDRESS 0xCF8 -static uint32_t e1000_addr; +static uint32_t e1000_addr=0; static char *get_class(uint8_t v) { |