mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to cope with bochs API changes

Browse Source
This commit is contained in:
Michael Brown 2006-04-26 00:04:49 +00:00
parent d6a0708209
commit 0944f2cd3e
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bochs/iodev/pcipnic.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pcipnic.cc,v 1.18 2006-03-07 21:11:19 sshwarts Exp $
// $Id: pcipnic.cc,v 1.19 2006-04-26 00:04:49 mcb30 Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 Fen Systems Ltd.
@ -22,6 +22,7 @@
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
// platforms that require a special tag on exported symbols, BX_PLUGGABLE
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
#include "iodev.h"
@ -59,11 +60,11 @@ bx_pcipnic_c::~bx_pcipnic_c()
void bx_pcipnic_c::init(void)
{
// called once when bochs initializes
bx_list_c *base;
// Read in values from config interface
base = (bx_list_c*) SIM->get_param(BXPN_PNIC);
memcpy(BX_PNIC_THIS s.physaddr, SIM->get_param_string("macaddr", base)->getptr(), 6);
memcpy(BX_PNIC_THIS s.macaddr, SIM->get_param_string("macaddr", base)->getptr(), 6);
BX_PNIC_THIS s.devfunc = 0x00;
DEV_register_pci_handlers(this, &BX_PNIC_THIS s.devfunc, BX_PLUGIN_PCIPNIC,
@ -423,6 +424,9 @@ void bx_pcipnic_c::exec_command(void)
case PNIC_CMD_XMIT :
BX_PNIC_THIS ethdev->sendpkt ( data, ilength );
if ( BX_PNIC_THIS s.irqEnabled ) {
set_irq_level(1);
}
status = PNIC_STATUS_OK;
break;

4
bochs/iodev/pcipnic.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pcipnic.h,v 1.5 2006-03-07 21:11:19 sshwarts Exp $
// $Id: pcipnic.h,v 1.6 2006-04-26 00:04:49 mcb30 Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003 Fen Systems Ltd.
@ -60,7 +60,7 @@ typedef struct {
} bx_pnic_t;
class bx_pcipnic_c : public bx_pci_device_stub_c {
class bx_pcipnic_c : public bx_ne2k_stub_c, bx_pci_device_stub_c {
public:
bx_pcipnic_c();
virtual ~bx_pcipnic_c();