From f8aae275a462e1d6c45ba188169ba8d4b408a27f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Fri, 7 May 2004 21:28:53 +0000 Subject: * fhandler_mem.cc (fhandler_dev_mem::fhandler_dev_mem): Move initialization of "mem_size" from here... (fhandler_dev_mem::open): ...to here. Fix typo in FH_PORT case. --- winsup/cygwin/fhandler_mem.cc | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'winsup/cygwin/fhandler_mem.cc') diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc index 1688ab064..64bf8e5ec 100644 --- a/winsup/cygwin/fhandler_mem.cc +++ b/winsup/cygwin/fhandler_mem.cc @@ -25,11 +25,20 @@ fhandler_dev_mem::fhandler_dev_mem () : fhandler_base () { - /* Reading physical memory only supported on NT/W2K. */ +} + +fhandler_dev_mem::~fhandler_dev_mem (void) +{ +} + +int +fhandler_dev_mem::open (int flags, mode_t) +{ if (!wincap.has_physical_mem_access ()) { - mem_size = 0; - return; + set_errno (ENOENT); + debug_printf ("%s is accessible under NT/W2K only", dev ().name); + return 0; } if (dev () == FH_MEM) /* /dev/mem */ @@ -53,7 +62,7 @@ fhandler_dev_mem::fhandler_dev_mem () mem_size = 0; debug_printf ("KMemSize: %d MB", mem_size >> 20); } - else if (dev () == FH_ZERO) /* /dev/port == First 64K of /dev/mem */ + else if (dev () == FH_PORT) /* /dev/port == First 64K of /dev/mem */ { mem_size = 65536; debug_printf ("PortSize: 64 KB"); @@ -63,21 +72,6 @@ fhandler_dev_mem::fhandler_dev_mem () mem_size = 0; debug_printf ("Illegal minor number!!!"); } -} - -fhandler_dev_mem::~fhandler_dev_mem (void) -{ -} - -int -fhandler_dev_mem::open (int flags, mode_t) -{ - if (!wincap.has_physical_mem_access ()) - { - set_errno (ENOENT); - debug_printf ("%s is accessible under NT/W2K only", dev ().name); - return 0; - } /* Check for illegal flags. */ if (flags & (O_APPEND | O_TRUNC | O_EXCL)) -- cgit v1.2.3