This is the mail archive of the libc-hacker@sourceware.cygnus.com mailing list for the glibc project.
Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Hi, I have appended two patches (one for glibc 2.1, one for glibc 2.2). I make sys/io.h platform specific, which means we will not install it on platforms where we don't have ioperm and iopl. For Alha and Intel I added inb, inw, outb, outw and co. This functions where missing since we don't include "asm/io.h" any longer. Here is the ChangeLog: 2000-01-22 Thorsten Kukuk <kukuk@suse.de> * sysdeps/unix/sysv/linux/Makefile(sysdep_headers): Remove sys/io.h. * sysdeps/unix/sysv/linux/alpha/Makefile: Add sys/io.h. * sysdeps/unix/sysv/linux/arm/Makefile: Likewise. * sysdeps/unix/sysv/linux/i386/Makefile: Likewise. * sysdeps/unix/sysv/linux/sys/io.h: Move from here ... * sysdeps/unix/sysv/linux/i386/sys/io.h: ... to here, add inb, outb and other inline functions for port access. * sysdeps/unix/sysv/linux/alpha/sys/io.h: Add prototypes for port access functions. -- Thorsten Kukuk http://www.suse.de/~kukuk/ kukuk@suse.de SuSE GmbH Schanzaeckerstr. 10 90443 Nuernberg Linux is like a Vorlon. It is incredibly powerful, gives terse, cryptic answers and has a lot of things going on in the background.
--- glibc-2.1/sysdeps/unix/sysv/linux/Makefile Fri Dec 10 07:33:26 1999 +++ glibc-2.1/sysdeps/unix/sysv/linux/Makefile Sat Jan 22 12:36:30 2000 @@ -16,7 +16,7 @@ sysdep_routines += sysctl clone llseek getresuid getresgid umount umount2 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ - sys/io.h sys/klog.h sys/kdaemon.h \ + sys/klog.h sys/kdaemon.h \ sys/user.h sys/procfs.h sys/prctl.h \ sys/kd.h sys/soundcard.h sys/vt.h \ sys/quota.h sys/fsuid.h \ --- glibc-2.1/sysdeps/unix/sysv/linux/alpha/Makefile Wed Oct 21 17:40:13 1998 +++ glibc-2.1/sysdeps/unix/sysv/linux/alpha/Makefile Sat Jan 22 12:32:45 2000 @@ -3,7 +3,7 @@ endif ifeq ($(subdir),misc) -sysdep_headers += alpha/ptrace.h alpha/regdef.h +sysdep_headers += alpha/ptrace.h alpha/regdef.h sys/io.h sysdep_routines += ieee_get_fp_control ieee_set_fp_control \ sethae ioperm osf_sigprocmask llseek adjtimex --- glibc-2.1/sysdeps/unix/sysv/linux/arm/Makefile Thu Jan 13 07:07:01 2000 +++ glibc-2.1/sysdeps/unix/sysv/linux/arm/Makefile Sat Jan 22 12:32:57 2000 @@ -1,6 +1,6 @@ ifeq ($(subdir),misc) sysdep_routines += setfsgid setfsuid setresgid setresuid ioperm -sysdep_headers += sys/elf.h +sysdep_headers += sys/elf.h sys/io.h endif ifeq ($(subdir),signal) --- glibc-2.1/sysdeps/unix/sysv/linux/i386/Makefile Fri Dec 10 07:33:26 1999 +++ glibc-2.1/sysdeps/unix/sysv/linux/i386/Makefile Sat Jan 22 12:32:05 2000 @@ -1,6 +1,6 @@ ifeq ($(subdir),misc) sysdep_routines += ioperm iopl vm86 setfsgid setfsuid setresgid setresuid -sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h +sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h endif ifeq ($(subdir),elf) --- glibc-2.1/sysdeps/unix/sysv/linux/i386/sys/io.h Thu Jan 1 01:00:00 1970 +++ glibc-2.1/sysdeps/unix/sysv/linux/i386/sys/io.h Sat Jan 22 13:14:27 2000 @@ -0,0 +1,178 @@ +/* Copyright (C) 1996, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _SYS_IO_H +#define _SYS_IO_H 1 + +#include <features.h> + +__BEGIN_DECLS + +/* If TURN_ON is TRUE, request for permission to do direct i/o on the + port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O + permission off for that range. This call requires root privileges. + + Portability note: not all Linux platforms support this call. Most + platforms based on the PC I/O architecture probably will, however. + E.g., Linux/Alpha for Alpha PCs supports this. */ +extern int ioperm __P ((unsigned long int __from, unsigned long int __num, + int __turn_on)); + +/* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to + access any I/O port is granted. This call requires root + privileges. */ +extern int iopl __P ((int __level)); + + +extern inline unsigned char +inb (unsigned short port) +{ + unsigned char _v; + + __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned char +inb_p (unsigned short port) +{ + unsigned char _v; + + __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned short +inw (unsigned short port) +{ + unsigned short _v; + + __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned short +inw_p (unsigned short port) +{ + unsigned short _v; + + __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned int +inl (unsigned short port) +{ + unsigned int _v; + + __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned int +inl_p (unsigned short port) +{ + unsigned int _v; + __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline void +outb (unsigned char value, unsigned short port) +{ + __asm__ __volatile__ ("outb %b0,%w1"::"a" (value), "Nd" (port)); +} + +extern inline void +outb_p (unsigned char value, unsigned short port) +{ + __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80"::"a" (value), + "Nd" (port)); +} + +extern inline void +outw (unsigned short value, unsigned short port) +{ + __asm__ __volatile__ ("outw %w0,%w1"::"a" (value), "Nd" (port)); + +} + +extern inline void +outw_p (unsigned short value, unsigned short port) +{ + __asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80"::"a" (value), + "Nd" (port)); +} + +extern inline void +outl (unsigned int value, unsigned short port) +{ + __asm__ __volatile__ ("outl %0,%w1"::"a" (value), "Nd" (port)); +} + +extern inline void +outl_p (unsigned int value, unsigned short port) +{ + __asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80"::"a" (value), + "Nd" (port)); +} + +extern inline void +insb (unsigned short port, void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +insw (unsigned short port, void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +insl (unsigned short port, void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +outsb (unsigned short port, const void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +outsw (unsigned short port, const void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +outsl (unsigned short port, const void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +__END_DECLS +#endif /* _SYS_IO_H */ --- glibc-2.1/sysdeps/unix/sysv/linux/sys/io.h Wed Jan 5 23:05:40 2000 +++ glibc-2.1/sysdeps/unix/sysv/linux/sys/io.h Thu Jan 1 01:00:00 1970 @@ -1,43 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _SYS_IO_H - -#define _SYS_IO_H 1 -#include <features.h> - -__BEGIN_DECLS - -/* If TURN_ON is TRUE, request for permission to do direct i/o on the - port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O - permission off for that range. This call requires root privileges. - - Portability note: not all Linux platforms support this call. Most - platforms based on the PC I/O architecture probably will, however. - E.g., Linux/Alpha for Alpha PCs supports this. */ -extern int ioperm __P ((unsigned long int __from, unsigned long int __num, - int __turn_on)); - -/* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to - access any I/O port is granted. This call requires root - privileges. */ -extern int iopl __P ((int __level)); - -__END_DECLS - -#endif /* _SYS_IO_H */ --- glibc-2.1/sysdeps/unix/sysv/linux/alpha/sys/io.h Wed Jan 5 23:05:40 2000 +++ glibc-2.1/sysdeps/unix/sysv/linux/alpha/sys/io.h Sat Jan 22 13:51:26 2000 @@ -17,8 +17,8 @@ Boston, MA 02111-1307, USA. */ #ifndef _SYS_IO_H - #define _SYS_IO_H 1 + #include <features.h> __BEGIN_DECLS @@ -63,6 +63,13 @@ unsigned long int __off, unsigned long int __len, unsigned char *__buf)); +/* Userspace declarations. */ +extern unsigned int inb __P ((unsigned long __port)); +extern unsigned int inw __P ((unsigned long __port)); +extern unsigned int inl __P ((unsigned long __port)); +extern void outb __P ((unsigned char __b, unsigned long __port)); +extern void outw __P ((unsigned short __w, unsigned long __port)); +extern void outl __P ((unsigned int __l, unsigned long __port)); __END_DECLS
--- glibc-2.2/sysdeps/unix/sysv/linux/Makefile Fri Dec 10 07:31:48 1999 +++ glibc-2.2/sysdeps/unix/sysv/linux/Makefile Sat Jan 22 13:23:09 2000 @@ -16,7 +16,7 @@ sysdep_routines += sysctl clone llseek getresuid getresgid umount umount2 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \ - sys/io.h sys/klog.h sys/kdaemon.h \ + sys/klog.h sys/kdaemon.h \ sys/user.h sys/procfs.h sys/prctl.h \ sys/kd.h sys/soundcard.h sys/vt.h \ sys/quota.h sys/fsuid.h \ --- glibc-2.2/sysdeps/unix/sysv/linux/alpha/Makefile Wed Oct 21 17:40:13 1998 +++ glibc-2.2/sysdeps/unix/sysv/linux/alpha/Makefile Sat Jan 22 13:23:09 2000 @@ -3,7 +3,7 @@ endif ifeq ($(subdir),misc) -sysdep_headers += alpha/ptrace.h alpha/regdef.h +sysdep_headers += alpha/ptrace.h alpha/regdef.h sys/io.h sysdep_routines += ieee_get_fp_control ieee_set_fp_control \ sethae ioperm osf_sigprocmask llseek adjtimex --- glibc-2.2/sysdeps/unix/sysv/linux/arm/Makefile Thu Jan 13 07:01:52 2000 +++ glibc-2.2/sysdeps/unix/sysv/linux/arm/Makefile Sat Jan 22 13:23:09 2000 @@ -1,6 +1,6 @@ ifeq ($(subdir),misc) sysdep_routines += setfsgid setfsuid setresgid setresuid ioperm -sysdep_headers += sys/elf.h +sysdep_headers += sys/elf.h sys/io.h endif ifeq ($(subdir),signal) --- glibc-2.2/sysdeps/unix/sysv/linux/i386/Makefile Fri Dec 10 07:31:49 1999 +++ glibc-2.2/sysdeps/unix/sysv/linux/i386/Makefile Sat Jan 22 13:23:09 2000 @@ -1,6 +1,6 @@ ifeq ($(subdir),misc) sysdep_routines += ioperm iopl vm86 setfsgid setfsuid setresgid setresuid -sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h +sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h endif ifeq ($(subdir),elf) --- glibc-2.2/sysdeps/unix/sysv/linux/i386/sys/io.h Thu Jan 1 01:00:00 1970 +++ glibc-2.2/sysdeps/unix/sysv/linux/i386/sys/io.h Sat Jan 22 13:27:51 2000 @@ -0,0 +1,178 @@ +/* Copyright (C) 1996, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _SYS_IO_H +#define _SYS_IO_H 1 + +#include <features.h> + +__BEGIN_DECLS + +/* If TURN_ON is TRUE, request for permission to do direct i/o on the + port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O + permission off for that range. This call requires root privileges. + + Portability note: not all Linux platforms support this call. Most + platforms based on the PC I/O architecture probably will, however. + E.g., Linux/Alpha for Alpha PCs supports this. */ +extern int ioperm (unsigned long int __from, unsigned long int __num, + int __turn_on) __THROW; + +/* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to + access any I/O port is granted. This call requires root + privileges. */ +extern int iopl (int __level) __THROW; + + +extern inline unsigned char +inb (unsigned short port) +{ + unsigned char _v; + + __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned char +inb_p (unsigned short port) +{ + unsigned char _v; + + __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned short +inw (unsigned short port) +{ + unsigned short _v; + + __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned short +inw_p (unsigned short port) +{ + unsigned short _v; + + __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned int +inl (unsigned short port) +{ + unsigned int _v; + + __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline unsigned int +inl_p (unsigned short port) +{ + unsigned int _v; + __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +extern inline void +outb (unsigned char value, unsigned short port) +{ + __asm__ __volatile__ ("outb %b0,%w1"::"a" (value), "Nd" (port)); +} + +extern inline void +outb_p (unsigned char value, unsigned short port) +{ + __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80"::"a" (value), + "Nd" (port)); +} + +extern inline void +outw (unsigned short value, unsigned short port) +{ + __asm__ __volatile__ ("outw %w0,%w1"::"a" (value), "Nd" (port)); + +} + +extern inline void +outw_p (unsigned short value, unsigned short port) +{ + __asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80"::"a" (value), + "Nd" (port)); +} + +extern inline void +outl (unsigned int value, unsigned short port) +{ + __asm__ __volatile__ ("outl %0,%w1"::"a" (value), "Nd" (port)); +} + +extern inline void +outl_p (unsigned int value, unsigned short port) +{ + __asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80"::"a" (value), + "Nd" (port)); +} + +extern inline void +insb (unsigned short port, void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +insw (unsigned short port, void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +insl (unsigned short port, void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +outsb (unsigned short port, const void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +outsw (unsigned short port, const void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +extern inline void +outsl (unsigned short port, const void *addr, unsigned long count) +{ + __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +__END_DECLS +#endif /* _SYS_IO_H */ --- glibc-2.2/sysdeps/unix/sysv/linux/sys/io.h Thu Dec 30 09:07:23 1999 +++ glibc-2.2/sysdeps/unix/sysv/linux/sys/io.h Thu Jan 1 01:00:00 1970 @@ -1,43 +0,0 @@ -/* Copyright (C) 1996, 1999 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _SYS_IO_H - -#define _SYS_IO_H 1 -#include <features.h> - -__BEGIN_DECLS - -/* If TURN_ON is TRUE, request for permission to do direct i/o on the - port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O - permission off for that range. This call requires root privileges. - - Portability note: not all Linux platforms support this call. Most - platforms based on the PC I/O architecture probably will, however. - E.g., Linux/Alpha for Alpha PCs supports this. */ -extern int ioperm (unsigned long int __from, unsigned long int __num, - int __turn_on) __THROW; - -/* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to - access any I/O port is granted. This call requires root - privileges. */ -extern int iopl (int __level) __THROW; - -__END_DECLS - -#endif /* _SYS_IO_H */ --- glibc-2.2/sysdeps/unix/sysv/linux/alpha/sys/io.h Thu Dec 30 09:07:23 1999 +++ glibc-2.2/sysdeps/unix/sysv/linux/alpha/sys/io.h Sat Jan 22 13:40:20 2000 @@ -64,6 +64,14 @@ unsigned long int __len, unsigned char *__buf) __THROW; +/* Userspace declarations. */ +extern unsigned int inb (unsigned long __port) __THROW; +extern unsigned int inw (unsigned long __port) __THROW; +extern unsigned int inl (unsigned long __port) __THROW; +extern void outb (unsigned char __b, unsigned long __port) __THROW; +extern void outw (unsigned short __w, unsigned long __port) __THROW; +extern void outl (unsigned int __l, unsigned long __port) __THROW; + __END_DECLS #endif /* _SYS_IO_H */
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |