* 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.
This commit is contained in:
Corinna Vinschen 2004-05-07 21:28:53 +00:00
parent 186420eccf
commit f8aae275a4
2 changed files with 19 additions and 19 deletions

View File

@ -1,3 +1,9 @@
2004-05-07 Corinna Vinschen <corinna@vinschen.de>
* 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.
2004-05-07 Gerd Spalink <Gerd.Spalink@t-online.de> 2004-05-07 Gerd Spalink <Gerd.Spalink@t-online.de>
* fhandler_dsp.cc (fhandler_dev_dsp::Audio_out::stop): Move delete of * fhandler_dsp.cc (fhandler_dev_dsp::Audio_out::stop): Move delete of

View File

@ -25,11 +25,20 @@
fhandler_dev_mem::fhandler_dev_mem () fhandler_dev_mem::fhandler_dev_mem ()
: fhandler_base () : 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 ()) if (!wincap.has_physical_mem_access ())
{ {
mem_size = 0; set_errno (ENOENT);
return; debug_printf ("%s is accessible under NT/W2K only", dev ().name);
return 0;
} }
if (dev () == FH_MEM) /* /dev/mem */ if (dev () == FH_MEM) /* /dev/mem */
@ -53,7 +62,7 @@ fhandler_dev_mem::fhandler_dev_mem ()
mem_size = 0; mem_size = 0;
debug_printf ("KMemSize: %d MB", mem_size >> 20); 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; mem_size = 65536;
debug_printf ("PortSize: 64 KB"); debug_printf ("PortSize: 64 KB");
@ -63,21 +72,6 @@ fhandler_dev_mem::fhandler_dev_mem ()
mem_size = 0; mem_size = 0;
debug_printf ("Illegal minor number!!!"); 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. */ /* Check for illegal flags. */
if (flags & (O_APPEND | O_TRUNC | O_EXCL)) if (flags & (O_APPEND | O_TRUNC | O_EXCL))