Dariaceli's Git
Browse code

Rearranged File ports for backwards compatibility.

Andrew Alderwick authored on 06/11/2021 00:51:43
Showing 14 changed files
projects/examples/blank.tal
History View file @ a92dd9f
... ... 
@@ -21,7 +21,7 @@
21 21 
 |60 @Audio3     [ &vector $2 &position $2 &output $1 &pad   $3 &adsr   $2 &length $2 &addr $2 &volume $1 &pitch $1 ]
22 22 
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
23 23 
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
24 
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save   $2 &stat $2 &delete $1 &append $1 ]
24 
+|a0 @File       [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &load $2 &save  $2 ]
25 25 
 |b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty   $2 &isdst $1 ]
26 26
27 27 
 ( variables )
projects/examples/demos/asma-piano.tal
History View file @ a92dd9f
... ... 
@@ -2,7 +2,7 @@
2 2
3 3 
 |00 @System     [ &vector $2 &wst      $1 &rst    $1 &pad   $4 &r $2 &g $2 &b $2   &debug $1 &halt $1 ]
4 4 
 |10 @Console    [ &vector $2 &read     $1 &pad    $5 &write $1 &error  $1 ]
5 
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
5 
+|a0 @File       [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
6 6
7 7 
 ( vectors )
8 8
projects/examples/demos/drum-rack.tal
History View file @ a92dd9f
... ... 
@@ -30,7 +30,7 @@
30 30 
 |70 @Midi       [ &vector $2 &channel  $1 &note   $1 &velocity $1 ]
31 31 
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
32 32 
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel $1 ]
33 
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
33 
+|a0 @File       [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
34 34
35 35 
 ( variables )
36 36
projects/examples/demos/font.tal
History View file @ a92dd9f
... ... 
@@ -12,7 +12,7 @@
12 12
13 13 
 |00 @System  &vector $2 &pad     $6 &r      $2 &g     $2 &b      $2
14 14 
 |20 @Screen  &vector $2 &width   $2 &height $2 &pad   $2 &x      $2 &y      $2 &addr $2 &pixel $1 &sprite $1
15 
-|a0 @File    &vector $2 &name    $2 &length $2 &success $2 &load $2 &save   $2 &stat $2 &delete $1 &append $1
15 
+|a0 @File    &vector $2 &success $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &load $2 &save $2
16 16
17 17 
 ( variables )
18 18
projects/examples/demos/piano.tal
History View file @ a92dd9f
... ... 
@@ -27,7 +27,7 @@
27 27 
 |70 @Midi       [ &vector $2 &channel  $1 &note   $1 &velocity $1 ]
28 28 
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
29 29 
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
30 
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
30 
+|a0 @File       [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
31 31
32 32 
 ( variables )
33 33
projects/examples/devices/file.load.tal
History View file @ a92dd9f
... ... 
@@ -4,7 +4,7 @@
4 4
5 5 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
6 6 
 |20 @Screen [ &vector $2 &width $2 &height $2 &pad $2 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ]
7 
-|a0 @File   [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
7 
+|a0 @File   [ &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
8 8
9 9 
 ( variables )
10 10
projects/examples/devices/file.save.tal
History View file @ a92dd9f
... ... 
@@ -3,7 +3,7 @@
3 3 
 ( devices )
4 4
5 5 
 |00 @System     [ &vector $2 &pad    $6 &r      $2 &g     $2 &b      $2 ]
6 
-|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
6 
+|a0 @File       [ &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
7 7
8 8 
 ( variables )
9 9
projects/examples/devices/file.tal
History View file @ a92dd9f
... ... 
@@ -8,7 +8,7 @@
8 8 
 |00 @System     [ &vector $2 &pad    $6 &r      $2 &g     $2 &b      $2 ]
9 9 
 |10 @Console    [ &pad    $8 &write  $1 ]
10 10 
 |20 @Screen     [ &vector $2 &width  $2 &height $2 &pad   $2 &x      $2 &y $2 &addr $2 &pixel $1 &sprite $1 ]
11 
-|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
11 
+|a0 @File       [ &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
12 12
13 13 
 ( variables )
14 14
projects/examples/gui/picture.tal
History View file @ a92dd9f
... ... 
@@ -7,7 +7,7 @@
7 7
8 8 
 |00 @System [ &vector $2 &pad $6 &r $2 &g $2 &b $2 ]
9 9 
 |20 @Screen [ &vector $2 &width $2 &height $2 &auto $1 &pad $1 &x $2 &y $2 &addr $2 &pixel $1 &sprite $1 ]
10 
-|a0 @File [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
10 
+|a0 @File [ &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
11 11
12 12 
 ( variables )
13 13
projects/software/asma.tal
History View file @ a92dd9f
... ... 
@@ -2,7 +2,7 @@
2 2
3 3 
 |00 @System     [ &vector $2 &wst  $1 &rst    $1 &pad   $4 &r $2 &g $2 &b $2   &debug $1 &halt $1 ]
4 4 
 |10 @Console    [ &vector $2 &read $1 &pad    $5 &write $1 &error  $1 ]
5 
-|a0 @File       [ &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
5 
+|a0 @File       [ &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
6 6
7 7 
 ( vectors )
8 8
projects/software/calc.tal
History View file @ a92dd9f
... ... 
@@ -35,7 +35,7 @@
35 35 
 |30 @Audio0     [ &vector $2 &position $2 &output $1 &pad   $3 &adsr   $2 &length $2 &addr $2 &volume $1 &pitch $1 ]
36 36 
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
37 37 
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
38 
-|a0 @File       [ &vector $2 &name     $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1 ]
38 
+|a0 @File       [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2 ]
39 39
40 40 
 ( variables )
41 41
projects/software/launcher.tal
History View file @ a92dd9f
... ... 
@@ -22,7 +22,7 @@
22 22 
 |20 @Screen  &vector $2 &width   $2 &height $2 &auto $1 &pad $1 &x      $2 &y      $2 &addr $2 &pixel $1 &sprite $1
23 23 
 |80 @Controller [ &vector $2 &button $1 &key    $1 ]
24 24 
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
25 
-|a0 @File    &vector $2 &name $2 &length $2 &success $2 &load $2 &save $2 &stat $2 &delete $1 &append $1
25 
+|a0 @File    &vector $2 &success $2 &stat $2 &delete $1 &append $1 &name $2 &length $2 &load $2 &save $2
26 26 
 |b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty $2 &isdst $1 ]
27 27
28 28 
 ( variables )
src/uxncli.c
History View file @ a92dd9f
... ... 
@@ -80,20 +80,23 @@ static void
80 80 
 file_deo(Device *d, Uint8 port)
81 81 
 {
82 82 
 	switch(port) {
83 
-	case 0x3:
84 
-		file_prepare(&d->mem[peek16(d->dat, 0x2)]);
83 
+	case 0x1:
84 
+		d->vector = peek16(d->dat, 0x0);
85 85 
 		break;
86 86 
 	case 0x9:
87 
-		poke16(d->dat, 0x6, file_read(&d->mem[peek16(d->dat, 0x8)], peek16(d->dat, 0x4)));
88 
-		break;
89 
-	case 0xb:
90 
-		poke16(d->dat, 0x6, file_write(&d->mem[peek16(d->dat, 0xa)], peek16(d->dat, 0x4), d->dat[0xf]));
87 
+		file_prepare(&d->mem[peek16(d->dat, 0x8)]);
91 88 
 		break;
92 89 
 	case 0xd:
93 
-		poke16(d->dat, 0x6, file_stat(&d->mem[peek16(d->dat, 0xc)], peek16(d->dat, 0x4)));
90 
+		poke16(d->dat, 0x2, file_read(&d->mem[peek16(d->dat, 0xc)], peek16(d->dat, 0xa)));
94 91 
 		break;
95 
-	case 0xe:
96 
-		poke16(d->dat, 0x6, file_delete());
92 
+	case 0xf:
93 
+		poke16(d->dat, 0x2, file_write(&d->mem[peek16(d->dat, 0xe)], peek16(d->dat, 0xa), d->dat[0x7]));
94 
+		break;
95 
+	case 0x5:
96 
+		poke16(d->dat, 0x2, file_stat(&d->mem[peek16(d->dat, 0x4)], peek16(d->dat, 0xa)));
97 
+		break;
98 
+	case 0x6:
99 
+		poke16(d->dat, 0x2, file_delete());
97 100 
 		break;
98 101 
 	}
99 102 
 }
src/uxnemu.c
History View file @ a92dd9f
... ... 
@@ -372,20 +372,23 @@ static void
372 372 
 file_deo(Device *d, Uint8 port)
373 373 
 {
374 374 
 	switch(port) {
375 
-	case 0x3:
376 
-		file_prepare(&d->mem[peek16(d->dat, 0x2)]);
375 
+	case 0x1:
376 
+		d->vector = peek16(d->dat, 0x0);
377 377 
 		break;
378 378 
 	case 0x9:
379 
-		poke16(d->dat, 0x6, file_read(&d->mem[peek16(d->dat, 0x8)], peek16(d->dat, 0x4)));
380 
-		break;
381 
-	case 0xb:
382 
-		poke16(d->dat, 0x6, file_write(&d->mem[peek16(d->dat, 0xa)], peek16(d->dat, 0x4), d->dat[0xf]));
379 
+		file_prepare(&d->mem[peek16(d->dat, 0x8)]);
383 380 
 		break;
384 381 
 	case 0xd:
385 
-		poke16(d->dat, 0x6, file_stat(&d->mem[peek16(d->dat, 0xc)], peek16(d->dat, 0x4)));
382 
+		poke16(d->dat, 0x2, file_read(&d->mem[peek16(d->dat, 0xc)], peek16(d->dat, 0xa)));
383 
+		break;
384 
+	case 0xf:
385 
+		poke16(d->dat, 0x2, file_write(&d->mem[peek16(d->dat, 0xe)], peek16(d->dat, 0xa), d->dat[0x7]));
386 
+		break;
387 
+	case 0x5:
388 
+		poke16(d->dat, 0x2, file_stat(&d->mem[peek16(d->dat, 0x4)], peek16(d->dat, 0xa)));
386 389 
 		break;
387 
-	case 0xe:
388 
-		poke16(d->dat, 0x6, file_delete());
390 
+	case 0x6:
391 
+		poke16(d->dat, 0x2, file_delete());
389 392 
 		break;
390 393 
 	}
391 394 
 }