[Wisp-cvs] wisp/src/builtin dictbase.wisp,1.244,1.245 modular.wisp,1.65,1.66 sys.wisp,1.114,1.115

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

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

Modified Files:
	dictbase.wisp modular.wisp sys.wisp 
Log Message:
Dropped |sys:raw:ioctl|.

Index: dictbase.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/src/builtin/dictbase.wisp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -d -r1.244 -r1.245
--- dictbase.wisp	13 Sep 2002 16:35:32 -0000	1.244
+++ dictbase.wisp	18 Sep 2002 20:55:16 -0000	1.245
@@ -145,7 +145,8 @@
 (local sys:getpid (asm NN_sys_getpid))
 (local sys:getppid (asm NN_sys_getppid))
 (local sys:getuid (asm NN_sys_getuid))
-(local sys:ns:waitpid (asm NN_sys_ns_waitpid))
+(local sys:low:tcgetattr (asm NN_sys_low_tcgetattr))
+(local sys:low:tcsetattr (asm NN_sys_low_tcsetattr))
 (local sys:select (asm NN_sys_select))
 (local sys:sync (asm NN_sys_sync))
 (local truncate (asm NN_truncate))

Index: modular.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/src/builtin/modular.wisp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- modular.wisp	13 Sep 2002 16:35:32 -0000	1.65
+++ modular.wisp	18 Sep 2002 20:55:16 -0000	1.66
@@ -59,9 +59,9 @@
               sys:getcwd sys:getegid sys:geteuid sys:getgid sys:getpgid
               sys:getpgrp sys:getpid sys:getppid sys:getuid sys:kill
               sys:link sys:listen sys:lseek sys:lstat sys:mkdir
-              sys:nanosleep sys:ns:waitpid sys:open sys:pipe sys:read
-              sys:rename sys:select sys:setpgid sys:setpgrp sys:setsid
-              sys:stat sys:symlink sys:sync sys:tcgetattr sys:tcsetattr
+              sys:nanosleep sys:open sys:pipe sys:read sys:rename
+              sys:select sys:setpgid sys:setpgrp sys:setsid sys:stat
+              sys:symlink sys:sync sys:tcgetattr sys:tcsetattr
               sys:truncate sys:unlink sys:waitpid sys:write))))))
 
   (define modules ; a box containing an alist

Index: sys.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/src/builtin/sys.wisp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- sys.wisp	13 Sep 2002 16:35:32 -0000	1.114
+++ sys.wisp	18 Sep 2002 20:55:16 -0000	1.115
@@ -118,13 +118,10 @@
       (sys:close fd)
       entries)))
 
-; This is specific to Linux and ia32.
+; FIXME: This is specific to Linux and ia32.
 (local (sys:tcgetattr fd)
-  (my buffer (make-string (system-constant 'size-of 'struct 'termios))
-    (my res (encsi ((asm NN_sys_raw_ioctl) (decui fd)
-                                           (decui (system-constant
-                                                    'ioctl 'TCGETS))
-                                           (asm buffer (l . 2))))
+  (my buffer (make-c8string (sys:low:tcgetattr))
+    (my res (sys:low:tcgetattr fd buffer)
       (cond
         ((zero? res)
           (list
@@ -163,16 +160,10 @@
                  (pack-le-integer lflag 4)
                  (integer->char line)
                  cc)
-      (my res (encsi ((asm NN_sys_raw_ioctl)
-                      (decui fd)
-                      (decui
-                        (system-constant
-                          'ioctl (case time
-                                   ((now)   'TCSETS)
-                                   ((drain) 'TCSETSW)
-                                   ((flush) 'TCSETSF)
-                                   (else (raise 'unknown time)))))
-                      (asm buffer (l . 2))))
+      (set! buffer (string-append
+                     buffer (make-c8string (- (sys:low:tcgetattr)
+                                              (length buffer)))))
+      (my res (sys:low:tcsetattr fd time buffer)
         (if (not (zero? res))
           (signal-system-error res `(sys:tcsetattr ,fd)))))))