[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] CVS: bochs/iodev ne2k.cc,1.64,1.65
From:       Volker Ruppert <vruppert () users ! sourceforge ! net>
Date:       2004-07-26 16:04:34
Message-ID: E1Bp7xq-0000wE-5Y () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/bochs/bochs/iodev
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3513/iodev

Modified Files:
	ne2k.cc 
Log Message:
- compilation fixes for ne2k with pci disabled (patch from suzu)


Index: ne2k.cc
===================================================================
RCS file: /cvsroot/bochs/bochs/iodev/ne2k.cc,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- ne2k.cc	11 Jul 2004 20:38:48 -0000	1.64
+++ ne2k.cc	26 Jul 2004 16:04:31 -0000	1.65
@@ -120,6 +120,7 @@
   BX_NE2K_THIS s.ISR.reset    = 1;
   BX_NE2K_THIS s.DCR.longaddr = 1;
 
+#if BX_PCI_SUPPORT
   if ((type == BX_RESET_HARDWARE) && (BX_NE2K_THIS s.pci_enabled)) {
     // This should be done by the PCI BIOS
     Bit32u baseaddr = bx_options.ne2k.Oioaddr->get ();
@@ -130,6 +131,7 @@
     BX_NE2K_THIS s.pci_conf[0x3c] = bx_options.ne2k.Oirq->get ();
     DEV_pci_init_irq(BX_NE2K_THIS s.devfunc, BX_NE2K_THIS s.pci_conf[0x3d], BX_NE2K_THIS s.base_irq);
   }
+#endif
   set_irq_level(0);
 }
 
@@ -1421,7 +1423,9 @@
 bx_ne2k_c::set_irq_level(bx_bool level)
 {
   if (BX_NE2K_THIS s.pci_enabled) {
+#if BX_PCI_SUPPORT
     DEV_pci_set_irq(BX_NE2K_THIS s.devfunc, BX_NE2K_THIS s.pci_conf[0x3d], level);
+#endif
   } else {
     if (level) {
       DEV_pic_raise_irq(BX_NE2K_THIS s.base_irq);



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]