From 42da4894c8d48d60be8de65812d857dafb0ccc3a Mon Sep 17 00:00:00 2001
From: tixiv <tixiv@gmx.net>
Date: Sat, 11 Jul 2009 16:50:11 +0000
Subject: [PATCH]

---
 joystick/config.in | 10 +++++-----
 joystick/nes_pad.c |  5 +++--
 makros.h           |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/joystick/config.in b/joystick/config.in
index c6c1a39..d0e1e62 100644
--- a/joystick/config.in
+++ b/joystick/config.in
@@ -120,11 +120,11 @@ choice 'Port ds'			\
    'PORTB' NES_PAD_PORT_PL 
 
 choice 'Pin pl'			\
-   "PINA  PINA \
-    PINB  PINB \
-    PINC  PINC \
-    PIND  PIND" \
-   'PINB' NES_PAD_PIN_DS
+   "PORTA  PORTA \
+    PORTB  PORTB \
+    PORTC  PORTC \
+    PORTD  PORTD" \
+   'PORTB' NES_PAD_PORT_DS
 
 
 choice 'Bit clk'			\
diff --git a/joystick/nes_pad.c b/joystick/nes_pad.c
index 1d9f0b4..7528919 100644
--- a/joystick/nes_pad.c
+++ b/joystick/nes_pad.c
@@ -5,7 +5,8 @@
 
 #define		NES_PAD_DDR_PL DDR(NES_PAD_PORT_PL)
 #define		NES_PAD_DDR_CLK DDR(NES_PAD_PORT_CLK)
-#define		NES_PAD_DDR_DS DDR(NES_PAD_PIN_DS)
+#define		NES_PAD_PIN_DS PIN(NES_PAD_PORT_DS)
+#define		NES_PAD_DDR_DS DDR(NES_PAD_PORT_DS)
 volatile unsigned char fakeport;  
 unsigned char waitForFire;
 
@@ -14,9 +15,9 @@ void joy_init(){
 
 	NES_PAD_DDR_PL |= 1<<NES_PAD_BIT_PL;
 	NES_PAD_DDR_CLK |= 1<<NES_PAD_BIT_CLK;
+	NES_PAD_PORT_DS |= (1<<NES_PAD_BIT_DS);//pullup	
 	NES_PAD_DDR_DS &= ~(1<<NES_PAD_BIT_DS);
 
-
 }
 
 void readButtons(){
diff --git a/makros.h b/makros.h
index 16e74d5..b2be208 100644
--- a/makros.h
+++ b/makros.h
@@ -1,5 +1,6 @@
 
 #define DDR(port) (*(volatile uint8_t*)((&port)-1))
+#define PIN(port) (*(volatile uint8_t*)((&port)-2))
 
 #define DDR_FROM_PIN(pin) (*(volatile uint8_t*)((&pin)+1))