general cleanups

3 files changed, 14 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 0b31adb..33fb1bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3 +3,3 @@
 *.eeprom
+*.map
+*.orig
diff --git a/Makefile b/Makefile
index 3f0732f..a44356e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,3 +33,5 @@ love: kbc.flash kbc.eeprom
 flash: kbc.flash
-	$(AVRDUDE) -y -p m48 -E noreset -U $^
+	$(AVRDUDE) -y -p m48 -E noreset -U flash:w:$<:r
+eeprom: kbc.eeprom
+	$(AVRDUDE) -y -p m48 -E noreset -U eeprom:w:$<:r
 
@@ -38,3 +40,3 @@ clean:
 
-.PHONY: love flash clean
+.PHONY: love flash eeprom clean
 .SECONDARY:
diff --git a/kbc.c b/kbc.c
index 81ba569..3568eda 100644
--- a/kbc.c
+++ b/kbc.c
@@ -92,2 +92,3 @@ static void usart_dis()
 
+#if 0
 static uint8_t dbgtx[64];
@@ -123,2 +124,6 @@ static void dbg_init(void)
 }
+#else
+#define dbg_init()
+#define dbg_wr(x)
+#endif
 
@@ -334,4 +339,4 @@ static uint8_t error;
 
-static const EEMEM char passwd[sizeof(PIN) - 1] = PIN;
-static char code[sizeof(PIN)];
+static const EEMEM uint8_t passwd[sizeof(PIN) - 1] = PIN;
+static uint8_t code[sizeof(PIN)];
 
@@ -481,3 +486,3 @@ ISR(SIG_OVERFLOW0)
 #define KBC_BASE 0x16
-const PROGMEM char kbc[] = {
+const PROGMEM uint8_t kbc[] = {
 /*	 0    1    2    3    4    5    6    7