From d7894f526ab848d62dca9d2f935bc5bd1523ee05 Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Tue, 6 Apr 2021 04:14:29 +0100
Subject: [PATCH] Change how 16-bit CPU registers are accessed in DOS.

---
 setter/src/dos/dos.c  | 16 ++++++++--------
 setter/src/dos/time.c | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/setter/src/dos/dos.c b/setter/src/dos/dos.c
index ee19325..9c1d219 100644
--- a/setter/src/dos/dos.c
+++ b/setter/src/dos/dos.c
@@ -64,26 +64,26 @@ unsigned int _dos_getdiskfree_ex(unsigned int drive, struct diskfree_ex_t* disks
     drivePath[2] = '\\';
     drivePath[3] = 0;
 
-    regs.w.ax = 0x7303;
+    regs.x.ax = 0x7303;
     sregs.ds  = FP_SEG(drivePath);
-    regs.w.dx = FP_OFF(drivePath);
+    regs.x.dx = FP_OFF(drivePath);
     sregs.es  = FP_SEG(copy);
-    regs.w.di = FP_OFF(copy);
-    regs.w.cx = sizeof(struct diskfree_ex_t);
+    regs.x.di = FP_OFF(copy);
+    regs.x.cx = sizeof(struct diskfree_ex_t);
 
     int86x(0x21, &regs, &regs, &sregs);
 
-    if(regs.h.al == 0 && !regs.w.cflag)
+    if(regs.h.al == 0 && !regs.x.cflag)
     {
         free(copy);
         errno = ENOSYS;
         return -1;
     }
-    else if(regs.w.cflag)
+    else if(regs.x.cflag)
     {
         free(copy);
         errno     = EINVAL;
-        _doserrno = regs.w.ax;
+        _doserrno = regs.x.ax;
         return -1;
     }
 
@@ -91,7 +91,7 @@ unsigned int _dos_getdiskfree_ex(unsigned int drive, struct diskfree_ex_t* disks
 
     free(copy);
     errno     = 0;
-    _doserrno = regs.w.ax;
+    _doserrno = regs.x.ax;
 
     return 0;
 #elif defined(__DJGPP__)
diff --git a/setter/src/dos/time.c b/setter/src/dos/time.c
index bd973bc..c95b83a 100644
--- a/setter/src/dos/time.c
+++ b/setter/src/dos/time.c
@@ -84,12 +84,12 @@ void Timestamps(const char* path)
 
             wRc = _dos_write(handle, message, strlen(message), &actionTaken);
             memset(&regs, 0, sizeof(regs));
-            regs.w.bx = handle;
-            regs.w.cx = dos_times[i].time;
-            regs.w.dx = dos_times[i].date;
-            regs.w.ax = dos_times[i].function;
+            regs.x.bx = handle;
+            regs.x.cx = dos_times[i].time;
+            regs.x.dx = dos_times[i].date;
+            regs.x.ax = dos_times[i].function;
             int86(0x21, &regs, &regs);
-            tRc = regs.w.ax;
+            tRc = regs.x.ax;
             cRc = _dos_close(handle);
         }