From 31756bc2c9897acc715c79cee0c0e420cec1ecfd Mon Sep 17 00:00:00 2001
From: Derek Stevens <nilix@nilfm.cc>
Date: Sat, 26 Mar 2022 15:12:56 -0600
Subject: [PATCH] update varvara file device, update to version 0.4

---
 server/xrxs.c             |  2 +-
 uxn-client/xrxs-local.tal | 21 +++++++++++----------
 uxn-client/xrxs.tal       | 29 +++++++++++++++--------------
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/server/xrxs.c b/server/xrxs.c
index 1572a94..85d7534 100644
--- a/server/xrxs.c
+++ b/server/xrxs.c
@@ -17,7 +17,7 @@
 #include "realm.h"
 #include "user.h"
 
-char version[] = "0.3";
+char version[] = "0.4";
 
 int chatty9p = 0;
 
diff --git a/uxn-client/xrxs-local.tal b/uxn-client/xrxs-local.tal
index a085eb6..b5d7ed7 100644
--- a/uxn-client/xrxs-local.tal
+++ b/uxn-client/xrxs-local.tal
@@ -29,8 +29,9 @@
 |60 @Audio3     [ &vector $2 &position $2 &output $1 &pad   $3 &adsr   $2 &length $2 &addr $2 &volume $1 &pitch $1 ]
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
-|a0 @File       [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &read $2 &write $2 ]
-|b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty   $2 &isdst $1 ]
+|a0 @File0      [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &read $2 &write $2 ]
+|b0 @File1      [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &read $2 &write $2 ]
+|c0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty   $2 &isdst $1 ]
 
 ( variables )
 
@@ -79,10 +80,10 @@
   #ff .btn-state STZ
   GET-USABLE-HEIGHT .list-height STZ
   
-  ;carts-file .File/name DEO2
-  #2000 .File/length DEO2
-  ;list-buf .File/read DEO2
-  .File/success DEI2 .list-len STZ2
+  ;carts-file .File0/name DEO2
+  #2000 .File0/length DEO2
+  ;list-buf .File0/read DEO2
+  .File0/success DEI2 .list-len STZ2
   
   CENTER-X .logo-coords/x STZ2
   CENTER-Y .logo-coords/y STZ2
@@ -851,7 +852,7 @@ RTN
 		it's not expecting.
 	)
 	
-		.File/name DEO2
+		.File0/name DEO2
 	
 		( clear wst )
 		#ab
@@ -916,9 +917,9 @@ RTN
 		OVR2 #f6fe ( arguments for STZ2 at fd and JMP (repeat) )
 		OVR2 #f401 ( arguments for STZ2 at fd, plus an extra 01 )
 		STHkr ( first argument for ADD2 )
-		.File/success ( argument for DEI2 )
-		#0100 .File/read ( arguments for DEO2 )
-		#ff00 .File/length DEO2
+		.File0/success ( argument for DEI2 )
+		#0100 .File0/read ( arguments for DEO2 )
+		#ff00 .File0/length DEO2
 		#00f0 JMP2
 	
 		&zero-page-loader
diff --git a/uxn-client/xrxs.tal b/uxn-client/xrxs.tal
index fb85480..cd601d4 100644
--- a/uxn-client/xrxs.tal
+++ b/uxn-client/xrxs.tal
@@ -29,8 +29,9 @@
 |60 @Audio3     [ &vector $2 &position $2 &output $1 &pad   $3 &adsr   $2 &length $2 &addr $2 &volume $1 &pitch $1 ]
 |80 @Controller [ &vector $2 &button   $1 &key    $1 ]
 |90 @Mouse      [ &vector $2 &x        $2 &y      $2 &state $1 &wheel  $1 ]
-|a0 @File       [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &read $2 &write $2 ]
-|b0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty   $2 &isdst $1 ]
+|a0 @File0      [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &read $2 &write $2 ]
+|b0 @File1      [ &vector $2 &success  $2 &stat   $2 &delete $1 &append $1 &name  $2 &length $2 &read $2 &write $2 ]
+|c0 @DateTime   [ &year   $2 &month    $1 &day    $1 &hour  $1 &minute $1 &second $1 &dotw $1 &doty   $2 &isdst $1 ]
 
 ( variables )
 
@@ -79,10 +80,10 @@
   #ff .btn-state STZ
   GET-USABLE-HEIGHT .list-height STZ
   
-  ;carts-file .File/name DEO2
-  #2000 .File/length DEO2
-  ;list-buf .File/read DEO2
-  .File/success DEI2 .list-len STZ2
+  ;carts-file .File0/name DEO2
+  #2000 .File0/length DEO2
+  ;list-buf .File0/read DEO2
+  .File0/success DEI2 .list-len STZ2
   
   CENTER-X .logo-coords/x STZ2
   CENTER-Y .logo-coords/y STZ2
@@ -824,10 +825,10 @@ RTN
   .state LDZ INC .state STZ
   
   ( send it! ) 
-  #0020 .File/length DEO2
-  #01 .File/append DEO2
-  ;ctl-file .File/name DEO2
-  ;load-cmd .File/write DEO2
+  #0020 .File0/length DEO2
+  #01 .File0/append DEO2
+  ;ctl-file .File0/name DEO2
+  ;load-cmd .File0/write DEO2
 
   ;slot-file ;load-rom JSR2
 RTN
@@ -844,7 +845,7 @@ RTN
 		it's not expecting.
 	)
 	
-		.File/name DEO2
+		.File0/name DEO2
 	
 		( clear wst )
 		#ab
@@ -909,9 +910,9 @@ RTN
 		OVR2 #f6fe ( arguments for STZ2 at fd and JMP (repeat) )
 		OVR2 #f401 ( arguments for STZ2 at fd, plus an extra 01 )
 		STHkr ( first argument for ADD2 )
-		.File/success ( argument for DEI2 )
-		#0100 .File/read ( arguments for DEO2 )
-		#ff00 .File/length DEO2
+		.File0/success ( argument for DEI2 )
+		#0100 .File0/read ( arguments for DEO2 )
+		#ff00 .File0/length DEO2
 		#00f0 JMP2
 	
 		&zero-page-loader