lib9p: idl: Touch up the *.9p files

6 files changed, 29 insertions, 28 deletions

diff --git a/lib9p/idl/1992-9P0.9p.wip b/lib9p/idl/1992-9P0.9p.wip
index 086e8e4..968e887 100644
--- a/lib9p/idl/1992-9P0.9p.wip
+++ b/lib9p/idl/1992-9P0.9p.wip
@@ -37,12 +37,12 @@ struct errstr = "64*(txt[1])"
 # "O"pen flags (flags to pass to Topen and Tcreate)
 # Unused bits are *ignored*.
 bitfield o = 1
-	"0=mode_0" # low bit of the 2-bit READ/WRITE/RDWR/EXEC enum
-	"1=mode_1" # high bit of the 2-bit READ/WRITE/RDWR/EXEC enum
+	"0=subfield(mode)" # low bit of the 2-bit READ/WRITE/RDWR/EXEC enum
+	"1=subfield(mode)" # high bit of the 2-bit READ/WRITE/RDWR/EXEC enum
 	#"2=unused"
 	#"3=unused"
 	"4=TRUNC"
-	#"5=_reserved_CEXEC" # close-on-exec
+	"5=reserved(CEXEC)" # close-on-exec
 	"6=RCLOSE" # remove-on-close
 	#"7=unused"
 
@@ -54,7 +54,8 @@ bitfield o = 1
 	"MODE_MASK = 0b00000011"
 	"FLAG_MASK = 0b11111100"
 
-# "C"??? "H"??? - file permissions and attributes
+# "CH"annel flags - file permissions and attributes (a "channel" is
+# what a file handle is called inside of the Plan 9 kernel).
 bitfield ch = 4
 	"31=DIR"
 	"30=APPEND"
diff --git a/lib9p/idl/1995-9P1.9p.wip b/lib9p/idl/1995-9P1.9p.wip
index 2caf39d..765356c 100644
--- a/lib9p/idl/1995-9P1.9p.wip
+++ b/lib9p/idl/1995-9P1.9p.wip
@@ -43,7 +43,7 @@ from ./1992-9P0.9p import tag, fid, qid, name, errstr, o, ch, stat
 # draft RFC).  As I understand it, CHMOUNT indicates that the file is
 # mounted by the kernel as a 9P transport; that the kernel has a lock
 # on doing I/O on it, so userspace can't do I/O on it.
-bitfield ch += "28=MOUNT"
+bitfield ch += "28=_PLAN9_MOUNT"
 
 # Authentication uses DES encryption.  The client obtains a ticket and
 # a nonce-key from a separate auth-server; how it does this is beyond
diff --git a/lib9p/idl/1996-Styx.9p.wip b/lib9p/idl/1996-Styx.9p.wip
index 6ba4509..3cb3774 100644
--- a/lib9p/idl/1996-Styx.9p.wip
+++ b/lib9p/idl/1996-Styx.9p.wip
@@ -40,7 +40,7 @@ msg Ropen    = "typ[1,val=11] tag[tag] fid[fid] qid[qid]"
 msg Tcreate  = "typ[1,val=12] tag[tag] fid[fid] name[name] perm[ch] mode[o]"
 msg Rcreate  = "typ[1,val=13] tag[tag] fid[fid] qid[qid]"
 # For `offset:max`, see `fs.c` `f_read()` and `f_write()`.
-# For `count:max`, see `styx.h:MAXFDATA'.
+# For `count:max`, see `styx.h:MAXFDATA`.
 msg Tread    = "typ[1,val=14] tag[tag] fid[fid] offset[8,max=s64_max] count[2,max=8192]"
 msg Rread    = "typ[1,val=15] tag[tag] fid[fid] count[2,max=8192] pad[1] count*(data[1])"
 msg Twrite   = "typ[1,val=16] tag[tag] fid[fid] offset[8,max=s64_max] count[2,max=8192] pad[1] count*(data[1])"
diff --git a/lib9p/idl/2002-9P2000.9p b/lib9p/idl/2002-9P2000.9p
index 2a4f7ed..c569c74 100644
--- a/lib9p/idl/2002-9P2000.9p
+++ b/lib9p/idl/2002-9P2000.9p
@@ -36,13 +36,13 @@ bitfield dm = 4
 	"31=DIR"
 	"30=APPEND"
 	"29=EXCL"
-	# DMMOUNT has been around in Plan 9 forever (CHMOUNT in <4e),
+	# DMMOUNT has been around in Plan 9 since 2e (CHMOUNT in <4e),
 	# but is undocumented, and is explicitly excluded from the
 	# 9P2000 draft RFC.  As I understand it, DMMOUNT indicates
 	# that the file is mounted by the kernel as a 9P transport;
 	# that the kernel has a lock on doing I/O on it, so userspace
 	# can't do I/O on it.
-	"28=reserved(PLAN9_MOUNT)"
+	"28=_PLAN9_MOUNT"
 	"27=AUTH"
 	"26=TMP"
 	#...
@@ -63,7 +63,7 @@ bitfield qt = 1
 	"7=DIR"
 	"6=APPEND"
 	"5=EXCL"
-	"4=reserved(PLAN9_MOUNT)" # See "PLAN9_MOUNT" in "dm" above.
+	"4=_PLAN9_MOUNT" # See "_PLAN9_MOUNT" in "dm" above.
 	"3=AUTH"
 	# Fun historical fact: QTTMP was a relatively late addition to
 	# Plan 9, in 2003-12.
diff --git a/lib9p/idl/2005-9P2000.u.9p b/lib9p/idl/2005-9P2000.u.9p
index fefe3e9..1bf5070 100644
--- a/lib9p/idl/2005-9P2000.u.9p
+++ b/lib9p/idl/2005-9P2000.u.9p
@@ -28,7 +28,7 @@ msg Tattach += "n_uid[nuid]"
 msg Rerror += "errno[errno]"
 
 bitfield dm += "23=DEVICE"
-               "21=NAMEDPIPE"
+               "21=PIPE"
                "20=SOCKET"
                "19=SETUID"
                "18=SETGID"
diff --git a/lib9p/idl/2010-9P2000.L.9p b/lib9p/idl/2010-9P2000.L.9p
index 7ac86a6..89af6a5 100644
--- a/lib9p/idl/2010-9P2000.L.9p
+++ b/lib9p/idl/2010-9P2000.L.9p
@@ -73,15 +73,15 @@ bitfield lo = 4
 #
 # These match the Linux kernel's values.
 num dt = 1
-	"UNKNOWN    = 0"
-	"NAMED_PIPE = 1"
-	"CHAR_DEV   = 2"
-	"DIRECTORY  = 4"
-	"BLOCK_DEV  = 6"
-	"REGULAR    = 8"
-	"SYMLINK    = 10"
-	"SOCKET     = 12"
-	"WHITEOUT   = 14"
+	"UNKNOWN   = 0"
+	"PIPE      = 1"
+	"CHAR_DEV  = 2"
+	"DIRECTORY = 4"
+	"BLOCK_DEV = 6"
+	"REGULAR   = 8"
+	"SYMLINK   = 10"
+	"SOCKET    = 12"
+	"_WHITEOUT = 14"
 
 # Mode
 #
@@ -107,16 +107,16 @@ bitfield mode = 4
 	"1=PERM_OTHER_W"
 	"0=PERM_OTHER_X"
 
-	"FMT_NAMED_PIPE = LIB9P_DT_NAMED_PIPE<<12"
-	"FMT_CHAR_DEV   = LIB9P_DT_CHAR_DEV<<12"
-	"FMT_DIRECTORY  = LIB9P_DT_DIRECTORY<<12"
-	"FMT_BLOCK_DEV  = LIB9P_DT_BLOCK_DEV<<12"
-	"FMT_REGULAR    = LIB9P_DT_REGULAR<<12"
-	"FMT_SYMLINK    = LIB9P_DT_SYMLINK<<12"
-	"FMT_SOCKET     = LIB9P_DT_SOCKET<<12"
+	"FMT_PIPE      = LIB9P_DT_PIPE<<12"
+	"FMT_CHAR_DEV  = LIB9P_DT_CHAR_DEV<<12"
+	"FMT_DIRECTORY = LIB9P_DT_DIRECTORY<<12"
+	"FMT_BLOCK_DEV = LIB9P_DT_BLOCK_DEV<<12"
+	"FMT_REGULAR   = LIB9P_DT_REGULAR<<12"
+	"FMT_SYMLINK   = LIB9P_DT_SYMLINK<<12"
+	"FMT_SOCKET    = LIB9P_DT_SOCKET<<12"
 
-	"PERM_MASK      = 0000777" # PERM_*
-	"FMT_MASK       = 0170000" # _fmt_*
+	"PERM_MASK = 0000777" # PERM_*
+	"FMT_MASK  = 0170000" # _fmt_*
 
 # A boolean value that is for some reason 4 bytes wide.
 num b4 = 4