diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/mach/configure | 53 | ||||
| -rw-r--r-- | sysdeps/mach/configure.in | 10 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/Dist | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/Versions | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/ioperm.c | 51 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/sys/io.h | 178 |
6 files changed, 286 insertions, 11 deletions
diff --git a/sysdeps/mach/configure b/sysdeps/mach/configure index 72d5bf7d15..7238378796 100644 --- a/sysdeps/mach/configure +++ b/sysdeps/mach/configure @@ -168,20 +168,21 @@ for ifc in mach mach4 \ clock clock_priv host_priv host_security ledger lock_set \ processor processor_set task thread_act vm_map \ memory_object memory_object_default default_pager \ + i386/mach_i386 \ ; do ac_safe=`echo "mach/${ifc}.defs" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mach/${ifc}.defs""... $ac_c" 1>&6 -echo "configure:175: checking for mach/${ifc}.defs" >&5 +echo "configure:176: checking for mach/${ifc}.defs" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 180 "configure" +#line 181 "configure" #include "confdefs.h" #include <mach/${ifc}.defs> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -208,12 +209,12 @@ if test "x$mach_interface_list" = x; then fi echo $ac_n "checking for host_page_size in mach_host.defs""... $ac_c" 1>&6 -echo "configure:212: checking for host_page_size in mach_host.defs" >&5 +echo "configure:213: checking for host_page_size in mach_host.defs" >&5 if eval "test \"`echo '$''{'libc_cv_mach_host_page_size'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 217 "configure" +#line 218 "configure" #include "confdefs.h" #include <mach/mach_host.defs> EOF @@ -239,17 +240,17 @@ fi ac_safe=`echo "mach/machine/ndr_def.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for mach/machine/ndr_def.h""... $ac_c" 1>&6 -echo "configure:243: checking for mach/machine/ndr_def.h" >&5 +echo "configure:244: checking for mach/machine/ndr_def.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 248 "configure" +#line 249 "configure" #include "confdefs.h" #include <mach/machine/ndr_def.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -270,17 +271,17 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "machine/ndr_def.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/ndr_def.h""... $ac_c" 1>&6 -echo "configure:274: checking for machine/ndr_def.h" >&5 +echo "configure:275: checking for machine/ndr_def.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 279 "configure" +#line 280 "configure" #include "confdefs.h" #include <machine/ndr_def.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:285: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -303,3 +304,33 @@ fi fi + +echo $ac_n "checking for i386_io_perm_modify in mach_i386.defs""... $ac_c" 1>&6 +echo "configure:310: checking for i386_io_perm_modify in mach_i386.defs" >&5 +if eval "test \"`echo '$''{'libc_cv_mach_i386_ioports'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 315 "configure" +#include "confdefs.h" +#include <mach/i386/mach_i386.defs> +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "i386_io_perm_modify" >/dev/null 2>&1; then + rm -rf conftest* + libc_cv_mach_i386_ioports=yes +else + rm -rf conftest* + libc_cv_mach_i386_ioports=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$libc_cv_mach_i386_ioports" 1>&6 +if test $libc_cv_mach_i386_ioports = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_I386_IO_PERM_MODIFY 1 +EOF + +fi diff --git a/sysdeps/mach/configure.in b/sysdeps/mach/configure.in index 541fd77e59..fca2063e65 100644 --- a/sysdeps/mach/configure.in +++ b/sysdeps/mach/configure.in @@ -52,6 +52,7 @@ for ifc in mach mach4 \ clock clock_priv host_priv host_security ledger lock_set \ processor processor_set task thread_act vm_map \ memory_object memory_object_default default_pager \ + i386/mach_i386 \ ; do AC_CHECK_HEADER(mach/${ifc}.defs, [dnl mach_interface_list="$mach_interface_list $ifc"]) @@ -73,3 +74,12 @@ AC_CHECK_HEADER(mach/machine/ndr_def.h, [dnl DEFINES="$DEFINES -DNDR_DEF_HEADER='<mach/machine/ndr_def.h>'"], [dnl AC_CHECK_HEADER(machine/ndr_def.h, [dnl DEFINES="$DEFINES -DNDR_DEF_HEADER='<machine/ndr_def.h>'"])]) + +AC_CACHE_CHECK(for i386_io_perm_modify in mach_i386.defs, + libc_cv_mach_i386_ioports, [dnl +AC_EGREP_HEADER(i386_io_perm_modify, mach/i386/mach_i386.defs, + libc_cv_mach_i386_ioports=yes, + libc_cv_mach_i386_ioports=no)]) +if test $libc_cv_mach_i386_ioports = yes; then + AC_DEFINE([HAVE_I386_IO_PERM_MODIFY]) +fi diff --git a/sysdeps/mach/hurd/i386/Dist b/sysdeps/mach/hurd/i386/Dist index c58180257e..82c44df00b 100644 --- a/sysdeps/mach/hurd/i386/Dist +++ b/sysdeps/mach/hurd/i386/Dist @@ -1 +1,3 @@ static-start.S +sys/io.h +ioperm.c diff --git a/sysdeps/mach/hurd/i386/Versions b/sysdeps/mach/hurd/i386/Versions index 5731d9e01e..67e6d94204 100644 --- a/sysdeps/mach/hurd/i386/Versions +++ b/sysdeps/mach/hurd/i386/Versions @@ -4,4 +4,7 @@ libc { __register_frame; __register_frame_table; __deregister_frame; __frame_state_for; __register_frame_info_table; } + GLIBC_2.2.6 { + ioperm; + } } diff --git a/sysdeps/mach/hurd/i386/ioperm.c b/sysdeps/mach/hurd/i386/ioperm.c new file mode 100644 index 0000000000..4a3cd77164 --- /dev/null +++ b/sysdeps/mach/hurd/i386/ioperm.c @@ -0,0 +1,51 @@ +/* Access to hardware i/o ports. Hurd/x86 version. + Copyright (C) 2002 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <sys/io.h> +#include <hurd.h> +#include <mach/i386/mach_i386.h> + +int +ioperm (unsigned long int from, unsigned long int num, int turn_on) +{ +#if ! HAVE_I386_IO_PERM_MODIFY + return __hurd_fail (ENOSYS); +#else + error_t err; + device_t devmaster; + + /* With the device master port we get a capability that represents + this range of io ports. */ + err = __get_privileged_ports (NULL, &devmaster); + if (! err) + { + io_perm_t perm; + err = __i386_io_perm_create (devmaster, from, from + num, &perm); + __mach_port_deallocate (__mach_task_self (), devmaster); + if (! err) + { + /* Now we add or remove that set from our task's bitmap. */ + err = __i386_io_perm_modify (__mach_task_self (), perm, turn_on); + __mach_port_deallocate (__mach_task_self (), perm); + } + } + + return err ? __hurd_fail (err) : 0; +#endif +} diff --git a/sysdeps/mach/hurd/i386/sys/io.h b/sysdeps/mach/hurd/i386/sys/io.h new file mode 100644 index 0000000000..49ac9985a9 --- /dev/null +++ b/sysdeps/mach/hurd/i386/sys/io.h @@ -0,0 +1,178 @@ +/* Access to hardware i/o ports. GNU/x86 version. + Copyright (C) 2002 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; 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. */ +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; + +#if defined __GNUC__ && __GNUC__ >= 2 + +static __inline unsigned char +inb (unsigned short int port) +{ + unsigned char _v; + + __asm__ __volatile__ ("inb %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +static __inline unsigned char +inb_p (unsigned short int port) +{ + unsigned char _v; + + __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +static __inline unsigned short int +inw (unsigned short int port) +{ + unsigned short _v; + + __asm__ __volatile__ ("inw %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +static __inline unsigned short int +inw_p (unsigned short int port) +{ + unsigned short int _v; + + __asm__ __volatile__ ("inw %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +static __inline unsigned int +inl (unsigned short int port) +{ + unsigned int _v; + + __asm__ __volatile__ ("inl %w1,%0":"=a" (_v):"Nd" (port)); + return _v; +} + +static __inline unsigned int +inl_p (unsigned short int port) +{ + unsigned int _v; + __asm__ __volatile__ ("inl %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (port)); + return _v; +} + +static __inline void +outb (unsigned char value, unsigned short int port) +{ + __asm__ __volatile__ ("outb %b0,%w1": :"a" (value), "Nd" (port)); +} + +static __inline void +outb_p (unsigned char value, unsigned short int port) +{ + __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (value), + "Nd" (port)); +} + +static __inline void +outw (unsigned short int value, unsigned short int port) +{ + __asm__ __volatile__ ("outw %w0,%w1": :"a" (value), "Nd" (port)); + +} + +static __inline void +outw_p (unsigned short int value, unsigned short int port) +{ + __asm__ __volatile__ ("outw %w0,%w1\noutb %%al,$0x80": :"a" (value), + "Nd" (port)); +} + +static __inline void +outl (unsigned int value, unsigned short int port) +{ + __asm__ __volatile__ ("outl %0,%w1": :"a" (value), "Nd" (port)); +} + +static __inline void +outl_p (unsigned int value, unsigned short int port) +{ + __asm__ __volatile__ ("outl %0,%w1\noutb %%al,$0x80": :"a" (value), + "Nd" (port)); +} + +static __inline void +insb (unsigned short int port, void *addr, unsigned long int count) +{ + __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +static __inline void +insw (unsigned short int port, void *addr, unsigned long int count) +{ + __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +static __inline void +insl (unsigned short int port, void *addr, unsigned long int count) +{ + __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +static __inline void +outsb (unsigned short int port, const void *addr, unsigned long int count) +{ + __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +static __inline void +outsw (unsigned short int port, const void *addr, unsigned long int count) +{ + __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +static __inline void +outsl (unsigned short int port, const void *addr, unsigned long int count) +{ + __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr), + "=c" (count):"d" (port), "0" (addr), "1" (count)); +} + +#endif /* GNU C */ + +__END_DECLS +#endif /* _SYS_IO_H */ |