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

- fixed compilation error if long physical address is enabled (OHCI uses 32-bit

Browse Source 
address space only)
- added panic message for unsupported PCI memory flags (32-bit below 1 MB and
  64-bit address space are currently not supported)
This commit is contained in:
Volker Ruppert 2009-05-12 16:18:19 +00:00
parent 1357a64519
commit bdee17b183
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/iodev/pci.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pci.cc,v 1.64 2009-04-22 18:37:06 vruppert Exp $
// $Id: pci.cc,v 1.65 2009-05-12 16:18:19 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -546,6 +546,10 @@ bx_bool bx_pci_bridge_c::pci_set_base_mem(void *this_ptr, memory_handler_t f1, m
Bit32u oldbase = *addr;
Bit32u mask = ~(size - 1);
Bit8u pci_flags = pci_conf[0x00] & 0x0f;
if ((pci_flags & 0x06) > 0) {
BX_PANIC(("PCI base memory flag 0x%02x not supported", pci_flags));
return 0;
}
pci_conf[0x00] &= (mask & 0xf0);
pci_conf[0x01] &= (mask >> 8) & 0xff;
pci_conf[0x02] &= (mask >> 16) & 0xff;

4
bochs/iodev/usb_ohci.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: usb_ohci.h,v 1.15 2009-04-06 09:30:25 vruppert Exp $
// $Id: usb_ohci.h,v 1.16 2009-05-12 16:18:19 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2009 Benjamin D Lunt (fys at frontiernet net)
@ -136,7 +136,7 @@ struct OHCI_ISO_TD {
typedef struct {
bx_phy_address base_addr;
Bit32u base_addr;
int frame_index;
int interval_index;