joypad work started.

diff --git a/emulator/Makefile b/emulator/Makefile
index decb1a4..bef10fa 100644 (file)
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -9,20 +9,25 @@ OBJS=emu-main.o clock.o bus.o cpu.o \
 
 
 #LIBS=-L../libs -pthread -lrt -lncurses
-LIBS=-L../libs -L./ppucore -lmotones -lppucore -pthread -lrt
+        LIBS=-L../libs -lmotones -pthread -lrt \
+                 -L./ppucore -lppucore \
+                 -L./joypad -ljoypad
 
-INCLUDE=-I../include -Ippucore
+INCLUDE=-I../include -Ippucore -Ijoypad
 
 CFLAGS=-g $(INCLUDE) -Wall
 
 all:   $(BIN)
 
-$(BIN): $(OBJS) ../libs ppucore/libppucore.a
+$(BIN): $(OBJS) ../libs ppucore/libppucore.a joypad/libjoypad.a
        gcc -o $(BIN) $(OBJS) $(LIBS)
 
 ppucore/libppucore.a: ppucore/*.c
        make -C ppucore
 
+joypad/libjoypad.a: joypad/*.c
+       make -C joypad
+
 .c.o: 
        gcc $(CFLAGS) -c $<
 
@@ -36,6 +41,7 @@ test:
 
 clean:
        make -C ppucore clean
+       make -C joypad clean
        -rm $(OBJS) $(BIN) opcode \
                
 tag:

diff --git a/emulator/joypad/Makefile b/emulator/joypad/Makefile
new file mode 100644 (file)
index 0000000..b6b197a
--- /dev/null
+++ b/emulator/joypad/Makefile
@@ -0,0 +1,35 @@
+
+BIN=libjoypad.a
+TEST_BIN=jp-driver
+
+DUMMY_OBJS=jp-driver.o
+
+OBJS=joypad.o
+        
+LIBS=-L../../libs -L./ -lmotones -lppucore
+
+INCLUDE=-I../../include -I../
+
+CFLAGS=-g $(INCLUDE) -Wall
+
+LFLAGS=-g $(LIBS) -Wall
+
+all:   $(BIN)
+test:  $(TEST_BIN)
+
+$(TEST_BIN): $(BIN) $(DUMMY_OBJS) ../../libs
+       gcc -o $(TEST_BIN) $(DUMMY_OBJS) $(LFLAGS)
+
+$(BIN): $(OBJS) ../../libs
+       ar rcs $(BIN) $(OBJS)
+
+.c.o: 
+       gcc $(CFLAGS) -c $<
+
+clean:
+       -rm $(OBJS) $(DUMMY_OBJS) $(BIN) $(TEST_BIN)
+               
+tag:
+       cd ../.. && make tag
+
+

diff --git a/emulator/joypad/joypad.c b/emulator/joypad/joypad.c
new file mode 100644 (file)
index 0000000..9b4b835
--- /dev/null
+++ b/emulator/joypad/joypad.c
@@ -0,0 +1,10 @@
+#include "tools.h"
+
+
+int jp_init(void) {
+    return TRUE;
+}
+
+void jp_clean(void) {
+}
+

diff --git a/emulator/ppucore/Makefile b/emulator/ppucore/Makefile
index 23588ed..5b7577e 100644 (file)
--- a/emulator/ppucore/Makefile
+++ b/emulator/ppucore/Makefile
@@ -7,7 +7,7 @@ DUMMY_OBJS=dummy-driver2.o debug.o cartridge.o
 OBJS=ppucore.o vram.o vscreen.o palette.o \
         vga_xfer.o sprite.o
         
-LIBS=-L../../libs -L./ -lmotones -pthread -lrt -lppucore
+LIBS=-L../../libs -L./ -lmotones -lrt -lppucore
 
 INCLUDE=-I../../include -I../