Browse code

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

neauoire authored on 08/01/2022 00:47:01
Showing 12 changed files
... ...
@@ -13,3 +13,5 @@
13 13
 *theme
14 14
 
15 15
 *.rom
16
+
17
+*.[o0125678vqki]
... ...
@@ -8,6 +8,7 @@ HFILES=\
8 8
 	/sys/include/npe/stdio.h\
9 9
 	src/devices/audio.h\
10 10
 	src/devices/controller.h\
11
+	src/devices/datetime.h\
11 12
 	src/devices/file.h\
12 13
 	src/devices/mouse.h\
13 14
 	src/devices/screen.h\
... ...
@@ -32,19 +33,19 @@ bin:
32 33
 %.rom:Q: %.tal bin/uxnasm
33 34
 	bin/uxnasm $stem.tal $target >/dev/null
34 35
 
35
-bin/uxncli: file.$O system.$O uxncli.$O uxn.$O
36
+bin/uxncli: file.$O datetime.$O system.$O uxncli.$O uxn.$O
36 37
 	$LD $LDFLAGS -o $target $prereq
37 38
 
38 39
 bin/uxnasm: uxnasm.$O
39 40
 	$LD $LDFLAGS -o $target $prereq
40 41
 
41
-bin/uxnemu: audio.$O controller.$O file.$O mouse.$O screen.$O system.$O uxn.$O uxnemu.$O
42
+bin/uxnemu: audio.$O controller.$O datetime.$O file.$O mouse.$O screen.$O system.$O uxn.$O uxnemu.$O
42 43
 	$LD $LDFLAGS -o $target $prereq
43 44
 
44 45
 (uxnasm|uxncli|uxnemu|uxn)\.$O:R: src/\1.c
45 46
 	$CC $CFLAGS -Isrc -o $target src/$stem1.c
46 47
 
47
-(audio|controller|file|mouse|screen|system)\.$O:R: src/devices/\1.c
48
+(audio|controller|datetime|file|mouse|screen|system)\.$O:R: src/devices/\1.c
48 49
 	$CC $CFLAGS -Isrc -o $target src/devices/$stem1.c
49 50
 
50 51
 nuke:V: clean
... ...
@@ -28,4 +28,4 @@ extern UxnAudio uxn_audio[POLYPHONY];
28 28
 Uint8 audio_get_vu(UxnAudio *c);
29 29
 int audio_render(UxnAudio *c, Sint16 *sample, Sint16 *end);
30 30
 void audio_start(UxnAudio *c, Uint16 adsr, Uint8 pitch);
31
-void audio_finished_handler(UxnAudio *c);
32 31
\ No newline at end of file
32
+void audio_finished_handler(UxnAudio *c);
... ...
@@ -49,4 +49,4 @@ controller_special(Device *d, Uint8 key)
49 49
 		uxn_eval(d->u, GETVECTOR(d));
50 50
 		d->dat[4] = 0x00;
51 51
 	}
52
-}
53 52
\ No newline at end of file
53
+}
... ...
@@ -13,4 +13,4 @@ WITH REGARD TO THIS SOFTWARE.
13 13
 void controller_down(Device *d, Uint8 mask);
14 14
 void controller_up(Device *d, Uint8 mask);
15 15
 void controller_key(Device *d, Uint8 key);
16
-void controller_special(Device *d, Uint8 key);
17 16
\ No newline at end of file
17
+void controller_special(Device *d, Uint8 key);
... ...
@@ -37,4 +37,4 @@ datetime_dei(Device *d, Uint8 port)
37 37
 	case 0xa: return t->tm_isdst;
38 38
 	default: return d->dat[port];
39 39
 	}
40
-}
41 40
\ No newline at end of file
41
+}
... ...
@@ -10,4 +10,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 10
 WITH REGARD TO THIS SOFTWARE.
11 11
 */
12 12
 
13
-Uint8 datetime_dei(Device *d, Uint8 port);
14 13
\ No newline at end of file
14
+Uint8 datetime_dei(Device *d, Uint8 port);
... ...
@@ -174,4 +174,4 @@ file_deo(Device *d, Uint8 port)
174 174
 		DEVPOKE16(0x2, res);
175 175
 		break;
176 176
 	}
177
-}
178 177
\ No newline at end of file
178
+}
... ...
@@ -10,4 +10,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 10
 WITH REGARD TO THIS SOFTWARE.
11 11
 */
12 12
 
13
-void file_deo(Device *d, Uint8 port);
14 13
\ No newline at end of file
14
+void file_deo(Device *d, Uint8 port);
... ...
@@ -159,4 +159,4 @@ screen_deo(Device *d, Uint8 port)
159 159
 		break;
160 160
 	}
161 161
 	}
162
-}
163 162
\ No newline at end of file
163
+}
... ...
@@ -36,4 +36,4 @@ void screen_clear(UxnScreen *p, Layer *layer);
36 36
 void screen_redraw(UxnScreen *p, Uint32 *pixels);
37 37
 
38 38
 Uint8 screen_dei(Device *d, Uint8 port);
39
-void screen_deo(Device *d, Uint8 port);
40 39
\ No newline at end of file
40
+void screen_deo(Device *d, Uint8 port);
... ...
@@ -13,4 +13,4 @@ Uint8 system_dei(Device *d, Uint8 port);
13 13
 void system_deo(Device *d, Uint8 port);
14 14
 void system_deo_special(Device *d, Uint8 port);
15 15
 
16
-extern Uxn supervisor;
17 16
\ No newline at end of file
17
+extern Uxn supervisor;