[Wisp-cvs] wisp/modules linux.wrti,1.17,1.18 wisptyp.wrti,1.12,1.13

[<di...@us...>]

Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv25146/modules

Modified Files:
	linux.wrti wisptyp.wrti 
Log Message:
Dropped |sys:raw:ioctl|.

Index: linux.wrti
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/linux.wrti,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- linux.wrti	13 Sep 2002 16:34:57 -0000	1.17
+++ linux.wrti	18 Sep 2002 20:54:23 -0000	1.18
@@ -80,6 +80,8 @@
   (macro sys.getgid (conform) 47 \sys (believe %eax))
   (macro sys.geteuid (conform) 49 \sys (believe %eax))
   (macro sys.getegid (conform) 50 \sys (believe %eax))
+  (macro sys.ioctl (conform %ebx %ecx %edx) 54 \sys (believe %eax))
+  (macro sys.ioctl2 (conform %ebx %ecx %edx %esi) 54 \sys (believe %eax))
   (macro sys.setpgid (conform %ebx %ecx) 57 \sys (believe %eax))
   (macro sys.umask (conform %ebx) 60 \sys (believe %eax))
   (macro sys.chroot (conform %ebx) 61 \sys (believe %eax))
@@ -124,7 +126,7 @@
   (macro sys.getpeername swap rot 7 \skt (believe %eax) nip nip nip)
   (macro sys.shutdown swap 13 \skt (believe %eax) nip nip)
 
-  ; <asm/errno.h>
+  ;;;; <asm/errno.h>
   (macro EPERM            1) ; Operation not permitted
   (macro ENOENT           2) ; No such file or directory
   (macro ESRCH            3) ; No such process
@@ -253,7 +255,7 @@
   (macro ENOMEDIUM      123) ; No medium found
   (macro EMEDIUMTYPE    124) ; Wrong medium type
 
-  ; <bits/waitstatus.h> of glibc
+  ;;;; <bits/waitstatus.h> of glibc
   (macro WEXITSTATUS 8 rshift #xFF and)
   (macro WTERMSIG #x7F and)
   (macro WSTOPSIG WEXITSTATUS)
@@ -262,11 +264,11 @@
   (macro WIFSIGNALED dup WIFSTOPPED 0 = swap WIFEXITED 0 = and)
   (macro WCOREDUMP #x80 and 0 <>)
 
-  ; <linux/wait.h>
+  ;;;; <linux/wait.h>
   (macro WNOHANG   1)
   (macro WUNTRACED 2)
 
-  ; <asm/stat.h>
+  ;;;; <asm/stat.h>
   (macro stat.dev@ 0 + wyde@)
   (macro stat.ino@ 4 + tetra@)
   (macro stat.mode@ 8 + wyde@)
@@ -283,7 +285,35 @@
   (macro sizeof.struct-stat 64)
   (macro sizeof.struct-stat.aligned 64)
 
-  ; <linux/socket.h>
+  ;;;;; <bits/termios.h> (NOT <asm/termbits.h>)
+  ; c_cc characters
+  (macro VINTR 0)
+  (macro VQUIT 1)
+  (macro VERASE 2)
+  (macro VKILL 3)
+  (macro VEOF 4)
+  (macro VTIME 5)
+  (macro VMIN 6)
+  (macro VSWTC 7)
+  (macro VSTART 8)
+  (macro VSTOP 9)
+  (macro VSUSP 10)
+  (macro VEOL 11)
+  (macro VREPRINT 12)
+  (macro VDISCARD 13)
+  (macro VWERASE 14)
+  (macro VLNEXT 15)
+  (macro VEOL2 16)
+  (macro sizeof.struct-termios 60)
+  (macro sizeof.struct-termios.aligned 60)
+
+  ;;;; <asm/ioctl.h>
+  (macro TCGETS  #x5401)
+  (macro TCSETS  #x5402)
+  (macro TCSETSW #x5403)
+  (macro TCSETSF #x5404)
+
+  ;;;; <linux/socket.h>
   (macro AF_UNSPEC 0)     (macro PF_UNSPEC 0)
   (macro AF_UNIX 1)       (macro PF_UNIX 1)
   (macro AF_INET 2)       (macro PF_INET 2)

Index: wisptyp.wrti
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/wisptyp.wrti,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- wisptyp.wrti	11 Sep 2002 17:36:46 -0000	1.12
+++ wisptyp.wrti	18 Sep 2002 20:54:23 -0000	1.13
@@ -42,6 +42,12 @@
   (macro untag-node
     -16 and)
 
+  (macro require-c8string
+    dup get-type NC_C8STRING <> if 'WB_c8string_huh swap go-raise then)
+
+  (macro string-length
+    cell+ cell@)
+
   (macro string-data
     dup 2 cells + swap cell@ NC_C8STRING = if cell@ then)