# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1498253590 -10800
# Node ID 6ecf2f3ff05ad732c09d8995332d1e037d2d2b40
# Parent  403367d5df5a3a74bca3eb8dd37ca77885eb8ab5
- better pad input handling
- switch between 28 and 30 vertical tiles by pressing C

diff -r 403367d5df5a -r 6ecf2f3ff05a Makefile
--- a/Makefile	Thu Jun 22 07:44:48 2017 +0300
+++ b/Makefile	Sat Jun 24 00:33:10 2017 +0300
@@ -2,6 +2,7 @@
 asrc = $(wildcard src/*.s)
 aSsrc = $(wildcard src/*.S)
 obj = $(asrc:.s=.o) $(aSsrc:.S=.o) $(csrc:.c=.o)
+dep = $(csrc:.c=.d)
 
 name = test2
 elf = $(name).elf
@@ -38,10 +39,19 @@
 tunnel.ppm:
 	tools/tunnel >$@
 
+-include $(dep)
+
+%.d: %.c
+	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+
 .PHONY: clean
 clean:
 	rm -f $(obj) $(elf) $(bin) tun_data.h tunnel.ppm
 
+.PHONY: cleandep
+cleandep:
+	rm -f $(dep)
+
 .PHONY: run
 run: $(bin)
 	gens-sdl $<
diff -r 403367d5df5a -r 6ecf2f3ff05a src/intr.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/intr.h	Sat Jun 24 00:33:10 2017 +0300
@@ -0,0 +1,7 @@
+#ifndef INTR_H_
+#define INTR_H_
+
+void enable_intr(void);
+void disable_intr(void);
+
+#endif	/* INTR_H_ */
diff -r 403367d5df5a -r 6ecf2f3ff05a src/io.h
--- a/src/io.h	Thu Jun 22 07:44:48 2017 +0300
+++ b/src/io.h	Sat Jun 24 00:33:10 2017 +0300
@@ -58,7 +58,7 @@
 	bnstate = IO_REG_DATA(port);
 	IO_REG_DATA(port) = 0;		/* select mode 0 */
 	bnstate |= (IO_REG_DATA(port) << 2) & (IO_PAD_A | IO_PAD_START);
-	return bnstate;
+	return ~bnstate;
 }
 
 #endif	/* MEGADRIVE_IO_H_ */
diff -r 403367d5df5a -r 6ecf2f3ff05a src/main.c
--- a/src/main.c	Thu Jun 22 07:44:48 2017 +0300
+++ b/src/main.c	Sat Jun 24 00:33:10 2017 +0300
@@ -1,6 +1,8 @@
 #include <stdint.h>
 #include "vdp.h"
 #include "io.h"
+#include "pad.h"
+#include "intr.h"
 #include "tun_data.h"
 
 #define NAMETAB_A	6
@@ -25,8 +27,6 @@
 	VDP_PACK_RGB(7, 0, 3)		/* 15: fixed */
 };
 
-static int running = 1;
-
 
 int main(void)
 {
@@ -42,7 +42,6 @@
 	for(i=0; i<16; i++) {
 		VDP_PORT_DATA = pal[i];
 	}
-	vdp_set_bgcolor(0, 0);
 
 	for(i=0; i<tun_xtiles * tun_ytiles; i++) {
 		load_pattern(i, tun_tiles[i]);
@@ -61,10 +60,12 @@
 	vdp_enable_vintr();
 
 	for(;;) {
-		uint16_t bnstate = io_readpad(0);
+		pad_update(0);
 
-		if(bnstate & IO_PAD_START) {
-			running = !running;
+		if(pad_pressed(0, IO_PAD_C)) {
+			disable_intr();
+			vdp_setreg(VDP_REG_MODE2, vdp_getreg(VDP_REG_MODE2) ^ VDP_MODE2_V30CELL);
+			enable_intr();
 		}
 
 		vdp_wait_vblank();
@@ -101,8 +102,6 @@
 	int idx = CYCLE_BEG;
 	uint16_t first;
 
-	if(!running) return;
-
 	first = pal[idx];
 
 	vdp_begin_palette(0, idx);
diff -r 403367d5df5a -r 6ecf2f3ff05a src/pad.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/pad.h	Sat Jun 24 00:33:10 2017 +0300
@@ -0,0 +1,30 @@
+#ifndef PAD_H_
+#define PAD_H_
+
+#include "io.h"
+
+static uint16_t pad_bnstate[2], pad_prev_bnstate[2], pad_bndiff[2];
+
+static inline void pad_update(int pad)
+{
+	pad_prev_bnstate[pad] = pad_bnstate[pad];
+	pad_bnstate[pad] = io_readpad(pad);
+	pad_bndiff[pad] = pad_bnstate[pad] ^ pad_prev_bnstate[pad];
+}
+
+static inline int pad_pressed(int pad, uint16_t mask)
+{
+	return (pad_bnstate[pad] & mask & pad_bndiff[pad]) != 0;
+}
+
+static inline int pad_released(int pad, uint16_t mask)
+{
+	return (~pad_bnstate[pad] & mask & pad_bndiff[pad]) != 0;
+}
+
+static inline uint16_t pad_getstate(int pad)
+{
+	return pad_bnstate[pad];
+}
+
+#endif	/* PAD_H_ */
diff -r 403367d5df5a -r 6ecf2f3ff05a src/vdp.h
--- a/src/vdp.h	Thu Jun 22 07:44:48 2017 +0300
+++ b/src/vdp.h	Sat Jun 24 00:33:10 2017 +0300
@@ -60,6 +60,20 @@
 	VDP_TILE_HIGH_PRIO	= 0x8000
 };
 
+enum {
+	VDP_STAT_PAL		= 0x0001,
+	VDP_STAT_DMABUSY	= 0x0002,
+	VDP_STAT_HBLANK		= 0x0004,
+	VDP_STAT_VBLANK		= 0x0008,
+	VDP_STAT_ODDFIELD	= 0x0010,
+	VDP_STAT_SPRITE_COL	= 0x0020,
+	VDP_STAT_SPRITE_OVF = 0x0040,
+	VDP_STAT_VINTR		= 0x0080,
+	VDP_STAT_FIFO_FULL	= 0x0100,
+	VDP_STAT_FIFO_EMPTY	= 0x0200
+};
+
+
 static inline void vdp_setup_access(uint16_t addr, int rw, int memid)
 {
 	uint32_t type;
@@ -247,9 +261,20 @@
 	vdp_setreg(VDP_REG_SCROLL_TAB, addr >> 10);
 }
 
+static inline void vdp_wait_vblank_start(void)
+{
+	while(!(VDP_PORT_STATUS & VDP_STAT_VBLANK));
+}
+
+static inline void vdp_wait_vblank_end(void)
+{
+	while(VDP_PORT_STATUS & VDP_STAT_VBLANK);
+}
+
 static inline void vdp_wait_vblank(void)
 {
-	while(!(VDP_PORT_STATUS & 0x0008));
+	vdp_wait_vblank_start();
+	vdp_wait_vblank_end();
 }
 
 void vdp_init(void);