Browse Source

Linux LinNet and LinIoctl interface modules updated

Alexander Shiryaev 8 years ago
parent
commit
c88bc42e44

+ 10 - 13
BlackBox/_Linux_/Lin/Mod/Ioctl.txt

@@ -1,23 +1,20 @@
 MODULE LinIoctl ["libc.so.6"];
 
 	(*
-		A. V. Shiryaev, 2012.11
-
 		GNU/Linux
 		i386
 	*)
 
 	CONST
-		(* /usr/include/i386-linux-gnu/bits/ioctl-types.h *)
-			TIOCM_LE* = {0};
-			TIOCM_DTR* = {1};
-			TIOCM_RTS* = {2};
-			TIOCM_ST* = {3};
-			TIOCM_SR* = {4};
-			TIOCM_CTS* = {5};
-			TIOCM_CAR* = {6};
-			TIOCM_RNG* = {7};
-			TIOCM_DSR* = {8};
+		TIOCM_LE* = {0};
+		TIOCM_DTR* = {1};
+		TIOCM_RTS* = {2};
+		TIOCM_ST* = {3};
+		TIOCM_SR* = {4};
+		TIOCM_CTS* = {5};
+		TIOCM_CAR* = {6};
+		TIOCM_RNG* = {7};
+		TIOCM_DSR* = {8};
 
 		FIOCLEX* = 21585;
 		FIONCLEX* = 21584;
@@ -37,4 +34,4 @@ MODULE LinIoctl ["libc.so.6"];
 	PROCEDURE [ccall] ioctl0* ["ioctl"] (d: INTEGER; req: INTEGER): INTEGER;
 	PROCEDURE [ccall] ioctl1* ["ioctl"] (d: INTEGER; req: INTEGER; VAR arg: INTEGER): INTEGER;
 
-END LinIoctl.
+END LinIoctl.

+ 1 - 1
BlackBox/_Linux_/Lin/Mod/Net.txt

@@ -271,7 +271,7 @@ MODULE LinNet ["libc.so.6"];
 
 		Ptraddrinfo* = POINTER [untagged] TO addrinfo;
 		addrinfo* = RECORD [untagged]
-			(* Linux, FreeBSD, OpenBSD *)
+			(* /usr/include/netdb.h *)
 				ai_flags*: intFlags; (* input flags *)
 				ai_family*: int; (* protocol family for socket *)
 				ai_socktype*: int; (* socket type *)

+ 1 - 1
BlackBox/_Linux_/Lin/Mod/gen-Ioctl/Makefile

@@ -18,7 +18,7 @@ Ioctl.txt: Ioctl.txt.templ ${DEFS} libver osname machine
 	${PY} ./untempl.py Ioctl.txt.templ $@
 
 defs-tiocm:
-	./dumpdefs.py 3 0 s ${INCDIR}/i386-linux-gnu/bits/ioctl-types.h | grep TIOCM_ > $@
+	./dumpdefs.py 2 0 s ${INCDIR}/i386-linux-gnu/bits/ioctl-types.h | grep TIOCM_ > $@
 
 clean:
 	rm -f mkioctl Ioctl.txt ${DEFS}