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

fixed compilation warnings

Browse Source
This commit is contained in:
Stanislav Shwartsman 2018-02-05 16:02:53 +00:00
parent 967f7d3381
commit 1e35e64ec6
6 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/iodev/display/vga.cc
View File

@ -1306,7 +1306,7 @@ void bx_vga_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
for (unsigned i = 0; i < io_len; i++) {
unsigned write_addr = address + i;
Bit8u old_value = BX_VGA_THIS pci_conf[write_addr];
// Bit8u old_value = BX_VGA_THIS pci_conf[write_addr];
Bit8u new_value = (Bit8u)(value & 0xff);
switch (write_addr) {
case 0x04: // disallowing write to command

7
bochs/iodev/pci_ide.cc
View File

@ -415,14 +415,13 @@ void bx_pci_ide_c::write(Bit32u address, Bit32u value, unsigned io_len)
// pci configuration space write callback handler
void bx_pci_ide_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
{
Bit8u value8, oldval;
if (((address >= 0x10) && (address < 0x20)) ||
((address > 0x23) && (address < 0x40)))
return;
for (unsigned i=0; i<io_len; i++) {
oldval = BX_PIDE_THIS pci_conf[address+i];
value8 = (value >> (i*8)) & 0xFF;
// Bit8u oldval = BX_PIDE_THIS pci_conf[address+i];
Bit8u value8 = (value >> (i*8)) & 0xFF;
switch (address+i) {
case 0x05:
case 0x06:

6
bochs/iodev/usb/uhci_core.cc
View File

@ -892,15 +892,13 @@ void bx_uhci_core_c::set_status(struct TD *td, bx_bool stalled, bx_bool data_buf
// pci configuration space write callback handler
void bx_uhci_core_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
{
Bit8u value8, oldval;
if (((address >= 0x10) && (address < 0x20)) ||
((address > 0x23) && (address < 0x34)))
return;
for (unsigned i=0; i<io_len; i++) {
value8 = (value >> (i*8)) & 0xFF;
oldval = pci_conf[address+i];
Bit8u value8 = (value >> (i*8)) & 0xFF;
// Bit8u oldval = pci_conf[address+i];
switch (address+i) {
case 0x04:
value8 &= 0x05;

6
bochs/iodev/usb/usb_ehci.cc
View File

@ -2235,14 +2235,12 @@ void bx_usb_ehci_c::runtime_config(void)
// pci configuration space write callback handler
void bx_usb_ehci_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
{
Bit8u value8, oldval;
if (((address >= 0x14) && (address <= 0x3b)) || (address > 0x80))
return;
for (unsigned i=0; i<io_len; i++) {
value8 = (value >> (i*8)) & 0xFF;
oldval = BX_EHCI_THIS pci_conf[address+i];
Bit8u value8 = (value >> (i*8)) & 0xFF;
// Bit8u oldval = BX_EHCI_THIS pci_conf[address+i];
switch (address+i) {
case 0x04:
value8 &= 0x06; // (bit 0 is read only for this card) (we don't allow port IO)

11
bochs/iodev/usb/usb_ohci.cc
View File

@ -1434,14 +1434,14 @@ void bx_usb_ohci_c::runtime_config(void)
// pci configuration space write callback handler
void bx_usb_ohci_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
{
Bit8u value8, oldval;
Bit8u value8;
if (((address >= 0x14) && (address <= 0x34)))
return;
for (unsigned i=0; i<io_len; i++) {
value8 = (value >> (i*8)) & 0xFF;
oldval = BX_OHCI_THIS pci_conf[address+i];
// Bit8u oldval = BX_OHCI_THIS pci_conf[address+i];
switch (address+i) {
case 0x04:
value8 &= 0x06; // (bit 0 is read only for this card) (we don't allow port IO)
@ -1519,13 +1519,10 @@ void bx_usb_ohci_c::usb_set_connect_status(Bit8u port, int type, bx_bool connect
}
// USB runtime parameter handler
const char *bx_usb_ohci_c::usb_param_handler(bx_param_string_c *param, int set,
const char *oldval, const char *val, int maxlen)
const char *bx_usb_ohci_c::usb_param_handler(bx_param_string_c *param, int set, const char *oldval, const char *val, int maxlen)
{
int portnum;
if (set) {
portnum = atoi((param->get_parent())->get_name()+4) - 1;
int portnum = atoi((param->get_parent())->get_name()+4) - 1;
bx_bool empty = ((strlen(val) == 0) || (!strcmp(val, "none")));
if ((portnum >= 0) && (portnum < USB_OHCI_PORTS)) {
if (empty && BX_OHCI_THIS hub.usb_port[portnum].HcRhPortStatus.ccs) {

6
bochs/iodev/usb/usb_xhci.cc
View File

@ -3106,14 +3106,12 @@ void bx_usb_xhci_c::runtime_config(void)
// pci configuration space write callback handler
void bx_usb_xhci_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
{
Bit8u value8, oldval;
if (((address >= 0x14) && (address <= 0x34)))
return;
for (unsigned i=0; i<io_len; i++) {
value8 = (value >> (i*8)) & 0xFF;
oldval = BX_XHCI_THIS pci_conf[address+i];
Bit8u value8 = (value >> (i*8)) & 0xFF;
// Bit8u oldval = BX_XHCI_THIS pci_conf[address+i];
switch (address+i) {
case 0x04:
value8 &= 0x06; // (bit 0 is read only for this card) (we don't allow port IO)