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

Fixed some gcc 4.8.1 warnings

Browse Source
This commit is contained in:
Volker Ruppert 2013-12-23 11:31:32 +00:00
parent e902a83a60
commit 8f5408e653
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/gui/x.cc
View File

@ -996,7 +996,7 @@ void send_keyboard_mouse_status(void)
prev_x, prev_y, current_x, current_y)); prev_x, prev_y, current_x, current_y));
if (x11_mouse_mode_absxy) { if (x11_mouse_mode_absxy) {
if ((current_y >= (int)bx_headerbar_y) && (current_y < (dimension_y + bx_headerbar_y))) { if ((current_y >= (int)bx_headerbar_y) && (current_y < (int)(dimension_y + bx_headerbar_y))) {
dx = current_x * 0x7fff / dimension_x; dx = current_x * 0x7fff / dimension_x;
dy = (current_y - bx_headerbar_y) * 0x7fff / dimension_y; dy = (current_y - bx_headerbar_y) * 0x7fff / dimension_y;
dz = current_z; dz = current_z;

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

@ -157,7 +157,7 @@ void bx_usb_xhci_c::init(void)
unsigned i; unsigned i;
char pname[6]; char pname[6];
bx_list_c *xhci, *port; bx_list_c *xhci, *port;
bx_param_string_c *device, *options; bx_param_string_c *device;
// Read in values from config interface // Read in values from config interface
xhci = (bx_list_c*) SIM->get_param(BXPN_USB_XHCI); xhci = (bx_list_c*) SIM->get_param(BXPN_USB_XHCI);
@ -1514,7 +1514,7 @@ void bx_usb_xhci_c::process_transfer_ring(const int slot, const int ep)
{ {
struct TRB trb; struct TRB trb;
Bit64u address = 0, org_addr; Bit64u address = 0, org_addr;
int int_target, td_size, transfer_length; int int_target, /*td_size,*/ transfer_length;
int ret, len; int ret, len;
int port_num = BX_XHCI_THIS hub.slots[slot].slot_context.rh_port_num; int port_num = BX_XHCI_THIS hub.slots[slot].slot_context.rh_port_num;
USBPacket packet; USBPacket packet;
@ -1569,7 +1569,7 @@ void bx_usb_xhci_c::process_transfer_ring(const int slot, const int ep)
// these are used in some/most items. // these are used in some/most items.
// If not used, won't hurt to extract bad data. // If not used, won't hurt to extract bad data.
int_target = TRB_GET_TARGET(trb.status); int_target = TRB_GET_TARGET(trb.status);
td_size = TRB_GET_TDSIZE(trb.status); // td_size = TRB_GET_TDSIZE(trb.status);
transfer_length = TRB_GET_TX_LEN(trb.status); transfer_length = TRB_GET_TX_LEN(trb.status);
is_transfer_trb = 0; // assume not a transfer is_transfer_trb = 0; // assume not a transfer
ioc = TRB_IOC(trb.command); ioc = TRB_IOC(trb.command);
@ -1759,7 +1759,7 @@ void bx_usb_xhci_c::process_transfer_ring(const int slot, const int ep)
void bx_usb_xhci_c::process_command_ring(void) void bx_usb_xhci_c::process_command_ring(void)
{ {
struct TRB trb; struct TRB trb;
int i, slot, slot_type, ep, comp_code = 0, new_addr = 0, bsr = 0; int i, slot, /*slot_type,*/ ep, comp_code = 0, new_addr = 0, bsr = 0;
Bit32u a_flags = 0, d_flags, tmpval1, tmpval2; Bit32u a_flags = 0, d_flags, tmpval1, tmpval2;
Bit64u org_addr; Bit64u org_addr;
Bit8u buffer[CONTEXT_SIZE + 2048]; Bit8u buffer[CONTEXT_SIZE + 2048];
@ -1799,7 +1799,7 @@ void bx_usb_xhci_c::process_command_ring(void)
case ENABLE_SLOT: case ENABLE_SLOT:
comp_code = NO_SLOTS_ERROR; // assume no slots comp_code = NO_SLOTS_ERROR; // assume no slots
slot = 0; slot = 0;
slot_type = TRB_GET_STYPE(trb.command); // currently not used // slot_type = TRB_GET_STYPE(trb.command); // currently not used
for (i=1; i<MAX_SLOTS; i++) { // slots are one based for (i=1; i<MAX_SLOTS; i++) { // slots are one based
if (BX_XHCI_THIS hub.slots[i].enabled == 0) { if (BX_XHCI_THIS hub.slots[i].enabled == 0) {
memset(&BX_XHCI_THIS hub.slots[i], 0, sizeof(struct HC_SLOT_CONTEXT)); memset(&BX_XHCI_THIS hub.slots[i], 0, sizeof(struct HC_SLOT_CONTEXT));