commit 9b9aae5

Devine Lu Linvega  ·  2024-07-01 05:26:47 +0000 UTC
parent 8d73001 
Do not pass memory to file_deo
6 files changed,  +7, -12
M src/devices/controller.h
M src/devices/datetime.h
M src/devices/file.c
M src/devices/file.h
M src/uxn11.c
M src/uxncli.c
M src/devices/controller.h
+0, -2 
1@@ -9,8 +9,6 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
2 WITH REGARD TO THIS SOFTWARE.
3 */
4 
5-#define CONTROL_VERSION 1
6-
7 void controller_down(Uint8 mask);
8 void controller_up(Uint8 mask);
9 void controller_key(Uint8 key);
M src/devices/datetime.h
+0, -2 
1@@ -9,6 +9,4 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
2 WITH REGARD TO THIS SOFTWARE.
3 */
4 
5-#define DATETIME_VERSION 1
6-
7 Uint8 datetime_dei(Uint8 addr);
M src/devices/file.c
+2, -1 
 1@@ -245,10 +245,11 @@ file_delete(UxnFile *c)
 2 /* IO */
 3 
 4 void
 5-file_deo(Uint8 id, Uint8 *d, Uint8 port)
 6+file_deo(Uint8 id, Uint8 port)
 7 {
 8 	UxnFile *c = &uxn_file[id];
 9 	Uint16 addr, len, res;
10+	Uint8 *d = id ? &uxn.dev[0xb0] : &uxn.dev[0xa0];
11 	switch(port) {
12 	case 0x5:
13 		addr = PEEK2(d + 0x4);
M src/devices/file.h
+1, -3 
 1@@ -9,9 +9,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 2 WITH REGARD TO THIS SOFTWARE.
 3 */
 4 
 5-#define FILE_VERSION 1
 6-
 7 #define POLYFILEY 2
 8 #define DEV_FILE0 0xa
 9 
10-void file_deo(Uint8 id, Uint8 *d, Uint8 port);
11+void file_deo(Uint8 id, Uint8 port);
M src/uxn11.c
+2, -2 
 1@@ -69,8 +69,8 @@ emu_deo(Uint8 addr, Uint8 value)
 2 		break;
 3 	case 0x10: console_deo(p); break;
 4 	case 0x20: screen_deo(p); break;
 5-	case 0xa0: file_deo(0, &uxn.dev[d], p); break;
 6-	case 0xb0: file_deo(1, &uxn.dev[d], p); break;
 7+	case 0xa0: file_deo(0, p); break;
 8+	case 0xb0: file_deo(1, p); break;
 9 	}
10 }
11
M src/uxncli.c
+2, -2 
 1@@ -39,8 +39,8 @@ emu_deo(Uint8 addr, Uint8 value)
 2 	switch(d) {
 3 	case 0x00: system_deo(p); break;
 4 	case 0x10: console_deo(p); break;
 5-	case 0xa0: file_deo(0, &uxn.dev[d], p); break;
 6-	case 0xb0: file_deo(1, &uxn.dev[d], p); break;
 7+	case 0xa0: file_deo(0, p); break;
 8+	case 0xb0: file_deo(1, p); break;
 9 	}
10 }
11