uxn

commit 8fdb039926b9371a48765e44ab697561503483c3
parent f5278f3a13f04c003a935f7c9a99994bf376cecd
Author: neauoire <aliceffekt@gmail.com>
Date:   Fri,  7 Jan 2022 16:47:01 -0800

Merge branch 'main' of git.sr.ht:~rabbits/uxn

Diffstat:
M
.gitignore
 | 
2
++
M
mkfile
 | 
7
++++---
M
src/devices/audio.h
 | 
3
+--
M
src/devices/controller.c
 | 
3
+--
M
src/devices/controller.h
 | 
3
+--
M
src/devices/datetime.c
 | 
3
+--
M
src/devices/datetime.h
 | 
3
+--
M
src/devices/file.c
 | 
3
+--
M
src/devices/file.h
 | 
3
+--
M
src/devices/screen.c
 | 
3
+--
M
src/devices/screen.h
 | 
3
+--
M
src/devices/system.h
 | 
3
+--

12 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,5 @@
 *theme
 
 *.rom
+
+*.[o0125678vqki]
diff --git a/mkfile b/mkfile
@@ -8,6 +8,7 @@ HFILES=\
 	/sys/include/npe/stdio.h\
 	src/devices/audio.h\
 	src/devices/controller.h\
+	src/devices/datetime.h\
 	src/devices/file.h\
 	src/devices/mouse.h\
 	src/devices/screen.h\
@@ -32,19 +33,19 @@ bin:
 %.rom:Q: %.tal bin/uxnasm
 	bin/uxnasm $stem.tal $target >/dev/null
 
-bin/uxncli: file.$O system.$O uxncli.$O uxn.$O
+bin/uxncli: file.$O datetime.$O system.$O uxncli.$O uxn.$O
 	$LD $LDFLAGS -o $target $prereq
 
 bin/uxnasm: uxnasm.$O
 	$LD $LDFLAGS -o $target $prereq
 
-bin/uxnemu: audio.$O controller.$O file.$O mouse.$O screen.$O system.$O uxn.$O uxnemu.$O
+bin/uxnemu: audio.$O controller.$O datetime.$O file.$O mouse.$O screen.$O system.$O uxn.$O uxnemu.$O
 	$LD $LDFLAGS -o $target $prereq
 
 (uxnasm|uxncli|uxnemu|uxn)\.$O:R: src/\1.c
 	$CC $CFLAGS -Isrc -o $target src/$stem1.c
 
-(audio|controller|file|mouse|screen|system)\.$O:R: src/devices/\1.c
+(audio|controller|datetime|file|mouse|screen|system)\.$O:R: src/devices/\1.c
 	$CC $CFLAGS -Isrc -o $target src/devices/$stem1.c
 
 nuke:V: clean
diff --git a/src/devices/audio.h b/src/devices/audio.h
@@ -28,4 +28,4 @@ extern UxnAudio uxn_audio[POLYPHONY];
 Uint8 audio_get_vu(UxnAudio *c);
 int audio_render(UxnAudio *c, Sint16 *sample, Sint16 *end);
 void audio_start(UxnAudio *c, Uint16 adsr, Uint8 pitch);
-void audio_finished_handler(UxnAudio *c);
-\ No newline at end of file
+void audio_finished_handler(UxnAudio *c);
diff --git a/src/devices/controller.c b/src/devices/controller.c
@@ -49,4 +49,4 @@ controller_special(Device *d, Uint8 key)
 		uxn_eval(d->u, GETVECTOR(d));
 		d->dat[4] = 0x00;
 	}
-}
-\ No newline at end of file
+}
diff --git a/src/devices/controller.h b/src/devices/controller.h
@@ -13,4 +13,4 @@ WITH REGARD TO THIS SOFTWARE.
 void controller_down(Device *d, Uint8 mask);
 void controller_up(Device *d, Uint8 mask);
 void controller_key(Device *d, Uint8 key);
-void controller_special(Device *d, Uint8 key);
-\ No newline at end of file
+void controller_special(Device *d, Uint8 key);
diff --git a/src/devices/datetime.c b/src/devices/datetime.c
@@ -37,4 +37,4 @@ datetime_dei(Device *d, Uint8 port)
 	case 0xa: return t->tm_isdst;
 	default: return d->dat[port];
 	}
-}
-\ No newline at end of file
+}
diff --git a/src/devices/datetime.h b/src/devices/datetime.h
@@ -10,4 +10,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-Uint8 datetime_dei(Device *d, Uint8 port);
-\ No newline at end of file
+Uint8 datetime_dei(Device *d, Uint8 port);
diff --git a/src/devices/file.c b/src/devices/file.c
@@ -174,4 +174,4 @@ file_deo(Device *d, Uint8 port)
 		DEVPOKE16(0x2, res);
 		break;
 	}
-}
-\ No newline at end of file
+}
diff --git a/src/devices/file.h b/src/devices/file.h
@@ -10,4 +10,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-void file_deo(Device *d, Uint8 port);
-\ No newline at end of file
+void file_deo(Device *d, Uint8 port);
diff --git a/src/devices/screen.c b/src/devices/screen.c
@@ -159,4 +159,4 @@ screen_deo(Device *d, Uint8 port)
 		break;
 	}
 	}
-}
-\ No newline at end of file
+}
diff --git a/src/devices/screen.h b/src/devices/screen.h
@@ -36,4 +36,4 @@ void screen_clear(UxnScreen *p, Layer *layer);
 void screen_redraw(UxnScreen *p, Uint32 *pixels);
 
 Uint8 screen_dei(Device *d, Uint8 port);
-void screen_deo(Device *d, Uint8 port);
-\ No newline at end of file
+void screen_deo(Device *d, Uint8 port);
diff --git a/src/devices/system.h b/src/devices/system.h
@@ -13,4 +13,4 @@ Uint8 system_dei(Device *d, Uint8 port);
 void system_deo(Device *d, Uint8 port);
 void system_deo_special(Device *d, Uint8 port);
 
-extern Uxn supervisor;
-\ No newline at end of file
+extern Uxn supervisor;