summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2013-03-22 04:45:44 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2013-03-22 04:45:44 (GMT)
commitad0a8d14550dad96e4f5ee2f30c2d766fae26837 (patch)
treebbd80968226443b0898eeb59acc65ef45721dc58
parentabf91e9ecdcf1245e85e17e85fed23e7598e20c7 (diff)
downloadvirtio9p-ad0a8d14550dad96e4f5ee2f30c2d766fae26837.zip
virtio9p-ad0a8d14550dad96e4f5ee2f30c2d766fae26837.tar.gz
virtio9p-ad0a8d14550dad96e4f5ee2f30c2d766fae26837.tar.bz2
virtio9p-ad0a8d14550dad96e4f5ee2f30c2d766fae26837.tar.xz
Switch from CDS_DPBPTR to CDS_USERVAL
Might be safer, who knows...
-rw-r--r--acc.asm2
-rw-r--r--start.asm12
2 files changed, 12 insertions, 2 deletions
diff --git a/acc.asm b/acc.asm
index 1908fbc..87d7ce3 100644
--- a/acc.asm
+++ b/acc.asm
@@ -107,7 +107,7 @@ GPROC(acc_cds)
/* Fall through */
END(acc_cds)
LPROC(acc_cds_common)
- cmpw $CDS_MAGIC,%fs:CDS_DPBPTR(%si) /* Our magic? */
+ cmpw $CDS_MAGIC,%fs:CDS_USERVAL(%si) /* Our magic? */
jne acc_fail
movb drive_letter,%al
cmpb %al,%fs:(CDS_PATH+0)(%si) /* Our drive letter? */
diff --git a/start.asm b/start.asm
index 9a47556..24fa13f 100644
--- a/start.asm
+++ b/start.asm
@@ -662,6 +662,16 @@ send_attach:
/* ------------------------------------------------------------------------- *
* Actually install the filesystem driver
* ------------------------------------------------------------------------- */
+#ifdef DEBUG
+ debugmsg "Our CDS = "
+ pushw our_cds+2
+ call debug_printhex4
+ debugmsg ":"
+ pushw our_cds
+ call debug_printhex4
+ call debug_crlf
+#endif
+
/* NOTE: we stop maintaining %es == %ds here */
movw $0x352f,%ax /* Get interrupt vector 0x2f */
@@ -680,7 +690,7 @@ send_attach:
movb drive_letter,%al /* Now %eax = "X:\" + NUL for the proper X */
movl %eax,%es:(%bx) /* Set current directory */
- movw $CDS_MAGIC,%es:CDS_DPBPTR(%bx) /* Available field, set to magic */
+ movw $CDS_MAGIC,%es:CDS_USERVAL(%bx) /* Available field, set to magic */
movw $2,%es:CDS_ROOTOFFSET(%bx) /* Path starts after X: */
/* ------------------------------------------------------------------------- *