From 11aa8c9f37f4b509b65d66884bb0d09fa5d83614 Mon Sep 17 00:00:00 2001
From: gir <gir@invalid.invalid>
Date: Thu, 9 Jul 2009 20:08:40 +0000
Subject: [PATCH] =?UTF-8?q?Unterst=C3=BCtzung=20f=C3=BCr=20NES=20gamecontr?=
 =?UTF-8?q?oller?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 borg_hw/borg_hw_pd1165.c |  5 ++-
 joystick/Makefile        |  5 +++
 joystick/config.in       | 69 +++++++++++++++++++++++++++++++++++++++-
 joystick/joystick.c      |  1 +
 joystick/joystick.h      | 38 +++++++++++++++-------
 joystick/nes_pad.c       | 45 ++++++++++++++++++++++++++
 main.c                   |  1 +
 7 files changed, 150 insertions(+), 14 deletions(-)
 create mode 100644 joystick/nes_pad.c

diff --git a/borg_hw/borg_hw_pd1165.c b/borg_hw/borg_hw_pd1165.c
index 235db4f..873c21b 100644
--- a/borg_hw/borg_hw_pd1165.c
+++ b/borg_hw/borg_hw_pd1165.c
@@ -150,6 +150,9 @@ SIGNAL(SIG_OUTPUT_COMPARE0)
 	//Watchdog zurücksetzen
 	wdt_reset();
 	
+	//Tasten für joystick einlesen
+	readButtons();
+
 	for(row=0; row < 8; row++){
 		pd1165_write(row, pixmap[plane][row][0]);
 		CTRLPORT &= ~((1<<BIT_CS3)|(1<<BIT_RW));
@@ -243,7 +246,7 @@ void timer2_on(){
 		
 */
 		TCCR2 = (1<<WGM21) | (1<<COM20) | 1 ; //CTC, OC2 toggle, clk/1
-		OCR2 = 100; //80kHz clock on OC2
+		OCR2 = 92; //80kHz clock on OC2
 
 }
 
diff --git a/joystick/Makefile b/joystick/Makefile
index 8eed376..e56e760 100644
--- a/joystick/Makefile
+++ b/joystick/Makefile
@@ -6,4 +6,9 @@ include $(TOPDIR)/defaults.mk
 SRC  = joystick.c
 SRC_SIM =
 
+ifeq ($(JOYSTICK_TYPE), JOYSTICK_NES)
+  SRC = nes_pad.c
+endif
+
+
 include $(TOPDIR)/rules.mk
diff --git a/joystick/config.in b/joystick/config.in
index 79df59d..8882684 100644
--- a/joystick/config.in
+++ b/joystick/config.in
@@ -1,5 +1,11 @@
 dep_bool_menu "joystick support" JOYSTICK_SUPPORT y
 
+choice 'Joystick type'			\
+   "NES-Pad  JOYSTICK_NES \
+    Parallel  JOYSTICK_PARALLEL" \
+   'JOYSTICK_PARALLEL' JOYSTICK_TYPE
+
+
 ###################### Parallel joystick menu #################################
 dep_bool_menu "parallel joystick support" PARALLEL_JOYSTICK_SUPPORT y
 
@@ -96,6 +102,67 @@ choice 'Bit fire'			\
 endmenu
 ###############################################################################
 
+###################### NES-Pad menu #################################
+dep_bool_menu "nes-pad support" NES_PAD_SUPPORT y
+
+choice 'Port clk'			\
+   "PORTA  PORTA \
+    PORTB  PORTB \
+    PORTC  PORTC \
+    PORTD  PORTD" \
+   'PORTB' NES_PAD_PORT_CLK
+
+choice 'Port ds'			\
+   "PORTA  PORTA \
+    PORTB  PORTB \
+    PORTC  PORTC \
+    PORTD  PORTD" \
+   'PORTB' NES_PAD_PORT_PL 
+
+choice 'Pin pl'			\
+   "PINA  PINA \
+    PINB  PINB \
+    PINC  PINC \
+    PIND  PIND" \
+   'PINB' NES_PAD_PIN_DS
 
 
-endmenu
\ No newline at end of file
+choice 'Bit clk'			\
+   "Bit0 0 \
+    Bit1 1 \
+    Bit2 2 \
+    Bit3 3 \
+    Bit4 4 \
+    Bit5 5 \
+    Bit6 6 \
+    Bit7 7" \
+   'Bit0' NES_PAD_BIT_CLK
+
+choice 'Bit pl'			\
+   "Bit0 0 \
+    Bit1 1 \
+    Bit2 2 \
+    Bit3 3 \
+    Bit4 4 \
+    Bit5 5 \
+    Bit6 6 \
+    Bit7 7" \
+   'Bit0' NES_PAD_BIT_PL
+
+choice 'Bit ds'			\
+   "Bit0 0 \
+    Bit1 1 \
+    Bit2 2 \
+    Bit3 3 \
+    Bit4 4 \
+    Bit5 5 \
+    Bit6 6 \
+    Bit7 7" \
+   'Bit0' NES_PAD_BIT_DS
+
+  
+endmenu
+###############################################################################
+
+
+endmenu
diff --git a/joystick/joystick.c b/joystick/joystick.c
index d1147c3..82ca646 100644
--- a/joystick/joystick.c
+++ b/joystick/joystick.c
@@ -8,6 +8,7 @@ unsigned char waitForFire;
 
 
 inline void joy_init(){
+
 	PORT_FROM_PIN(JOYSTICK_PIN_UP   ) |= (1<<JOYSTICK_BIT_UP   );
 	PORT_FROM_PIN(JOYSTICK_PIN_DOWN ) |= (1<<JOYSTICK_BIT_DOWN );
 	PORT_FROM_PIN(JOYSTICK_PIN_LEFT ) |= (1<<JOYSTICK_BIT_LEFT );
diff --git a/joystick/joystick.h b/joystick/joystick.h
index c1ca002..1ae74d3 100644
--- a/joystick/joystick.h
+++ b/joystick/joystick.h
@@ -4,25 +4,39 @@
 extern unsigned char waitForFire;
 void joy_init();
 
+
 #ifdef AVR
 
-#include <avr/io.h>
+#	include <avr/io.h>
+#	ifdef NES_PAD_SUPPORT
 
-#define JOYISUP    (!(JOYSTICK_PIN_UP    & (1<<JOYSTICK_BIT_UP   )))
-#define JOYISDOWN  (!(JOYSTICK_PIN_DOWN  & (1<<JOYSTICK_BIT_DOWN )))
-#define JOYISLEFT  (!(JOYSTICK_PIN_LEFT  & (1<<JOYSTICK_BIT_LEFT )))
-#define JOYISRIGHT (!(JOYSTICK_PIN_RIGHT & (1<<JOYSTICK_BIT_RIGHT)))
-#define JOYISFIRE  (!(JOYSTICK_PIN_FIRE  & (1<<JOYSTICK_BIT_FIRE )))
+		extern volatile unsigned char fakeport;
 
+#		define JOYISUP    (!! ((1<<4) & fakeport))
+#		define JOYISDOWN  (!! ((1<<5) & fakeport))
+#		define JOYISLEFT  (!! ((1<<6) & fakeport))
+#		define JOYISRIGHT (!! ((1<<7) & fakeport))
+#		define JOYISFIRE  (!! ((1<<0) & fakeport))
+
+
+#	else
+
+#		define JOYISUP    (!(JOYSTICK_PIN_UP    & (1<<JOYSTICK_BIT_UP   )))
+#		define JOYISDOWN  (!(JOYSTICK_PIN_DOWN  & (1<<JOYSTICK_BIT_DOWN )))
+#		define JOYISLEFT  (!(JOYSTICK_PIN_LEFT  & (1<<JOYSTICK_BIT_LEFT )))
+#		define JOYISRIGHT (!(JOYSTICK_PIN_RIGHT & (1<<JOYSTICK_BIT_RIGHT)))
+#		define JOYISFIRE  (!(JOYSTICK_PIN_FIRE  & (1<<JOYSTICK_BIT_FIRE )))
+
+#	endif
 #else
 
-extern unsigned char fakeport;
+	extern volatile unsigned char fakeport;
 
-#define JOYISUP    (0x10 & fakeport)
-#define JOYISDOWN  (0x08 & fakeport)    
-#define JOYISLEFT  (0x02 & fakeport)
-#define JOYISRIGHT (0x04 & fakeport)
-#define JOYISFIRE  (0x01 & fakeport)
+#	define JOYISUP    (0x10 & fakeport)
+#	define JOYISDOWN  (0x08 & fakeport)    
+#	define JOYISLEFT  (0x02 & fakeport)
+#	define JOYISRIGHT (0x04 & fakeport)
+#	define JOYISFIRE  (0x01 & fakeport)
 
 #endif
 
diff --git a/joystick/nes_pad.c b/joystick/nes_pad.c
new file mode 100644
index 0000000..1d9f0b4
--- /dev/null
+++ b/joystick/nes_pad.c
@@ -0,0 +1,45 @@
+#include <avr/io.h>
+#include <util/delay.h>
+#include "../makros.h"
+#include "../config.h"
+
+#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)
+volatile unsigned char fakeport;  
+unsigned char waitForFire;
+
+
+void joy_init(){
+
+	NES_PAD_DDR_PL |= 1<<NES_PAD_BIT_PL;
+	NES_PAD_DDR_CLK |= 1<<NES_PAD_BIT_CLK;
+	NES_PAD_DDR_DS &= ~(1<<NES_PAD_BIT_DS);
+
+
+}
+
+void readButtons(){
+	
+	NES_PAD_PORT_PL |= 1<<NES_PAD_BIT_PL;
+	asm volatile("nop\r\t");
+	asm volatile("nop\r\t");
+	asm volatile("nop\r\t");
+
+	NES_PAD_PORT_PL &= ~ (1<<NES_PAD_BIT_PL);
+
+	uint8_t i, port=0;
+	for(i=0; i<8; i++){
+
+		port >>= 1;
+		_delay_us(1);
+		if(NES_PAD_PIN_DS & (1 << NES_PAD_BIT_DS))
+			port |=0x80;
+
+		NES_PAD_PORT_CLK |= 1<<NES_PAD_BIT_CLK;
+	asm volatile("nop\r\t");
+	asm volatile("nop\r\t");
+		NES_PAD_PORT_CLK &= ~(1<<NES_PAD_BIT_CLK);
+	}
+	fakeport= ~port;
+}
diff --git a/main.c b/main.c
index a7c9aa8..979ada6 100644
--- a/main.c
+++ b/main.c
@@ -41,4 +41,5 @@ int main (void){
 
 	display_loop();
 
+
 }