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

check the nps bit before operating on the psm bit (#290)

Browse Source 
The PSM bit is only valid if NPS = 0 and a few other minor additions and
syntax fixes
This commit is contained in:
Benjamin David Lunt 2024-03-17 22:04:31 -07:00 committed by GitHub
parent e3274339e2
commit 4e378cbcf2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
bochs/iodev/usb/ohci_core.cc
View File

@ -2,8 +2,8 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2009-2023 Benjamin D Lunt (fys [at] fysnet [dot] net)
// 2009-2023 The Bochs Project
// Copyright (C) 2009-2024 Benjamin D Lunt (fys [at] fysnet [dot] net)
// 2009-2024 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -743,19 +743,21 @@ bool bx_ohci_core_c::mem_write(bx_phy_address addr, unsigned len, void *data)
hub.op_regs.HcRhDescriptorA.ocpm = (value & (1<<11)) ? 1 : 0;
hub.op_regs.HcRhDescriptorA.nps = (value & (1<< 9)) ? 1 : 0;
hub.op_regs.HcRhDescriptorA.psm = (value & (1<< 8)) ? 1 : 0;
if (hub.op_regs.HcRhDescriptorA.psm == 0) {
BX_INFO(("Ben: hub.op_regs.HcRhDescriptorA.psm == 0"));
// all ports have power, etc.
// hub.usb_port[p].HcRhPortStatus.pps = 1
// Call a routine to set each ports dword (LS, Connected, etc.)
} else {
BX_INFO(("Ben: hub.op_regs.HcRhDescriptorA.psm == 1"));
// only ports with bit set in rhstatus have power, etc.
// Call a routine to set each ports dword (LS, Connected, etc.)
if (hub.op_regs.HcRhDescriptorA.nps == 0) { // psm is only valid if nps == 0
if (hub.op_regs.HcRhDescriptorA.psm == 0) {
BX_INFO(("Ben: hub.op_regs.HcRhDescriptorA.psm == 0"));
// all ports have power, etc.
// hub.usb_port[p].HcRhPortStatus.pps = 1
// Call a routine to set each ports dword (LS, Connected, etc.)
} else {
BX_INFO(("Ben: hub.op_regs.HcRhDescriptorA.psm == 1"));
// only ports with bit set in rhstatus have power, etc.
// Call a routine to set each ports dword (LS, Connected, etc.)
}
}
break;
@ -774,24 +776,26 @@ bool bx_ohci_core_c::mem_write(bx_phy_address addr, unsigned len, void *data)
if (value & (1<<15)) hub.op_regs.HcRhStatus.drwe = 1;
if (value & (1<<17)) hub.op_regs.HcRhStatus.ocic = 1;
if (value & (1<<16)) {
if (hub.op_regs.HcRhDescriptorA.psm == 0) {
for (p=0; p<USB_OHCI_PORTS; p++)
hub.usb_port[p].HcRhPortStatus.pps = 1;
} else {
for (p=0; p<USB_OHCI_PORTS; p++)
if ((hub.op_regs.HcRhDescriptorB.ppcm & (1<<p)) == 0)
if (hub.op_regs.HcRhDescriptorA.nps == 0) { // psm is only valid if nps == 0
if (value & (1<<16)) {
if (hub.op_regs.HcRhDescriptorA.psm == 0) {
for (p=0; p<USB_OHCI_PORTS; p++)
hub.usb_port[p].HcRhPortStatus.pps = 1;
} else {
for (p=0; p<USB_OHCI_PORTS; p++)
if ((hub.op_regs.HcRhDescriptorB.ppcm & (1<<p)) == 0)
hub.usb_port[p].HcRhPortStatus.pps = 1;
}
}
}
if (value & (1<<0)) {
if (hub.op_regs.HcRhDescriptorA.psm == 0) {
for (p=0; p<USB_OHCI_PORTS; p++)
hub.usb_port[p].HcRhPortStatus.pps = 0;
} else {
for (p=0; p<USB_OHCI_PORTS; p++)
if (!(hub.op_regs.HcRhDescriptorB.ppcm & (1<<p)))
if (value & (1<<0)) {
if (hub.op_regs.HcRhDescriptorA.psm == 0) {
for (p=0; p<USB_OHCI_PORTS; p++)
hub.usb_port[p].HcRhPortStatus.pps = 0;
} else {
for (p=0; p<USB_OHCI_PORTS; p++)
if (!(hub.op_regs.HcRhDescriptorB.ppcm & (1<<p)))
hub.usb_port[p].HcRhPortStatus.pps = 0;
}
}
}
break;

6
bochs/iodev/usb/ohci_core.h
View File

@ -2,8 +2,8 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2009-2023 Benjamin D Lunt (fys [at] fysnet [dot] net)
// 2009-2023 The Bochs Project
// Copyright (C) 2009-2024 Benjamin D Lunt (fys [at] fysnet [dot] net)
// 2009-2024 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -247,7 +247,9 @@ public:
int event_handler(int event, void *ptr, int port);
#if !BX_USE_WIN32USBDEBUG
protected:
#endif
bx_ohci_core_t hub;
USBAsync *packets;