summaryrefslogtreecommitdiff
path: root/driver
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-10-14 22:36:16 +0200
committerMiguel <m.i@gmx.at>2018-10-14 22:36:16 +0200
commit2a6690e9fd53a02613796764248006e06ac482d6 (patch)
treeea3063ef3ecd0808e9291faf6c56949d91b1b09e /driver
parent5aeab1c853e487aa0042d5c32200d623efe908d3 (diff)
ported vim et al
Diffstat (limited to 'driver')
-rw-r--r--driver/e1000.c2
-rw-r--r--driver/keyboard.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/driver/e1000.c b/driver/e1000.c
index 7b4a7cb..5a1c847 100644
--- a/driver/e1000.c
+++ b/driver/e1000.c
@@ -503,7 +503,7 @@ struct netdev e1000_init(uint32_t base)
detectEEProm();
if (! readMACAddress()) return dev;
- klog("mac : %02x:%02x:%02x:%02x:%02x:%02x",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5],mac[6]);
+ klog("mac : %02x:%02x:%02x:%02x:%02x:%02x",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);
memcpy(dev.hwaddr,mac,6); // use mac obtained from device
dev.ip=(192<<0)+(168<<8)+(0<<16)+(20<<24); // 192.168.0.20 // TODO: not hardcode!
diff --git a/driver/keyboard.c b/driver/keyboard.c
index a153c9b..da8fe54 100644
--- a/driver/keyboard.c
+++ b/driver/keyboard.c
@@ -231,13 +231,13 @@ void keyboard_handle(uint8_t in)
else if(in==0xB4)
{
ascii='.';
- if(shift_l||shift_r||capslock) ascii='<';
+ if(shift_l||shift_r||capslock) ascii='>';
match=true;
}
else if(in==0xB3)
{
ascii=',';
- if(shift_l||shift_r||capslock) ascii='>';
+ if(shift_l||shift_r||capslock) ascii='<';
match=true;
}
else if(in==0x8D)