mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-10 02:54:58 -06:00
hw/usb/ohci: Code style fix comments
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <9b0aadedc7c4780fefdc27f14f72ac9003032fbf.1676916639.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
BALATON Zoltan
Philippe Mathieu-Daudé
parent
4713720a78
commit
572a673214
1 changed files with 49 additions and 50 deletions
|
|
@ -23,7 +23,7 @@
|
|||
* o Disable timers when nothing needs to be done, or remove timer usage
|
||||
* all together.
|
||||
* o BIOS work to boot from USB storage
|
||||
*/
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "hw/irq.h"
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
#include "hcd-ohci.h"
|
||||
|
||||
/* This causes frames to occur 1000x slower */
|
||||
//#define OHCI_TIME_WARP 1
|
||||
/*#define OHCI_TIME_WARP 1*/
|
||||
|
||||
#define ED_LINK_LIMIT 32
|
||||
|
||||
|
|
@ -335,8 +335,8 @@ static void ohci_soft_reset(OHCIState *ohci)
|
|||
ohci->per_cur = 0;
|
||||
ohci->done = 0;
|
||||
ohci->done_count = 7;
|
||||
|
||||
/* FSMPS is marked TBD in OCHI 1.0, what gives ffs?
|
||||
/*
|
||||
* FSMPS is marked TBD in OCHI 1.0, what gives ffs?
|
||||
* I took the value linux sets ...
|
||||
*/
|
||||
ohci->fsmps = 0x2778;
|
||||
|
|
@ -460,10 +460,10 @@ static inline int ohci_read_hcca(OHCIState *ohci,
|
|||
static inline int ohci_put_ed(OHCIState *ohci,
|
||||
dma_addr_t addr, struct ohci_ed *ed)
|
||||
{
|
||||
/* ed->tail is under control of the HCD.
|
||||
/*
|
||||
* ed->tail is under control of the HCD.
|
||||
* Since just ed->head is changed by HC, just write back this
|
||||
*/
|
||||
|
||||
return put_dwords(ohci, addr + ED_WBACK_OFFSET,
|
||||
(uint32_t *)((char *)ed + ED_WBACK_OFFSET),
|
||||
ED_WBACK_SIZE >> 2);
|
||||
|
|
@ -601,8 +601,10 @@ static int ohci_service_iso_td(OHCIState *ohci, struct ohci_ed *ed)
|
|||
trace_usb_ohci_iso_td_relative_frame_number_neg(relative_frame_number);
|
||||
return 1;
|
||||
} else if (relative_frame_number > frame_count) {
|
||||
/* ISO TD expired - retire the TD to the Done Queue and continue with
|
||||
the next ISO TD of the same ED */
|
||||
/*
|
||||
* ISO TD expired - retire the TD to the Done Queue and continue with
|
||||
* the next ISO TD of the same ED
|
||||
*/
|
||||
trace_usb_ohci_iso_td_relative_frame_number_big(relative_frame_number,
|
||||
frame_count);
|
||||
if (OHCI_CC_DATAOVERRUN == OHCI_BM(iso_td.flags, TD_CC)) {
|
||||
|
|
@ -845,9 +847,10 @@ static void ohci_td_pkt(const char *msg, const uint8_t *buf, size_t len)
|
|||
}
|
||||
}
|
||||
|
||||
/* Service a transport descriptor.
|
||||
Returns nonzero to terminate processing of this endpoint. */
|
||||
|
||||
/*
|
||||
* Service a transport descriptor.
|
||||
* Returns nonzero to terminate processing of this endpoint.
|
||||
*/
|
||||
static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
|
||||
{
|
||||
int dir;
|
||||
|
|
@ -956,10 +959,11 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
|
|||
}
|
||||
ep = usb_ep_get(dev, pid, OHCI_BM(ed->flags, ED_EN));
|
||||
if (ohci->async_td) {
|
||||
/* ??? The hardware should allow one active packet per
|
||||
endpoint. We only allow one active packet per controller.
|
||||
This should be sufficient as long as devices respond in a
|
||||
timely manner.
|
||||
/*
|
||||
* ??? The hardware should allow one active packet per
|
||||
* endpoint. We only allow one active packet per controller.
|
||||
* This should be sufficient as long as devices respond in a
|
||||
* timely manner.
|
||||
*/
|
||||
trace_usb_ohci_td_too_many_pending(ep->nr);
|
||||
return 1;
|
||||
|
|
@ -1048,8 +1052,10 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
|
|||
OHCI_SET_BM(td.flags, TD_EC, 3);
|
||||
break;
|
||||
}
|
||||
/* An error occurred so we have to clear the interrupt counter. See
|
||||
* spec at 6.4.4 on page 104 */
|
||||
/*
|
||||
* An error occurred so we have to clear the interrupt counter.
|
||||
* See spec at 6.4.4 on page 104
|
||||
*/
|
||||
ohci->done_count = 0;
|
||||
}
|
||||
ed->head |= OHCI_ED_H;
|
||||
|
|
@ -1234,18 +1240,17 @@ static void ohci_frame_boundary(void *opaque)
|
|||
}
|
||||
}
|
||||
|
||||
/* Start sending SOF tokens across the USB bus, lists are processed in
|
||||
/*
|
||||
* Start sending SOF tokens across the USB bus, lists are processed in
|
||||
* next frame
|
||||
*/
|
||||
static int ohci_bus_start(OHCIState *ohci)
|
||||
{
|
||||
trace_usb_ohci_start(ohci->name);
|
||||
|
||||
/* Delay the first SOF event by one frame time as
|
||||
* linux driver is not ready to receive it and
|
||||
* can meet some race conditions
|
||||
/*
|
||||
* Delay the first SOF event by one frame time as linux driver is
|
||||
* not ready to receive it and can meet some race conditions
|
||||
*/
|
||||
|
||||
ohci->sof_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
|
||||
ohci_eof_timer(ohci);
|
||||
|
||||
|
|
@ -1259,9 +1264,9 @@ void ohci_bus_stop(OHCIState *ohci)
|
|||
timer_del(ohci->eof_timer);
|
||||
}
|
||||
|
||||
/* Sets a flag in a port status register but only set it if the port is
|
||||
* connected, if not set ConnectStatusChange flag. If flag is enabled
|
||||
* return 1.
|
||||
/*
|
||||
* Sets a flag in a port status reg but only set it if the port is connected.
|
||||
* If not set ConnectStatusChange flag. If flag is enabled return 1.
|
||||
*/
|
||||
static int ohci_port_set_if_connected(OHCIState *ohci, int i, uint32_t val)
|
||||
{
|
||||
|
|
@ -1271,9 +1276,7 @@ static int ohci_port_set_if_connected(OHCIState *ohci, int i, uint32_t val)
|
|||
if (val == 0)
|
||||
return 0;
|
||||
|
||||
/* If CurrentConnectStatus is cleared we set
|
||||
* ConnectStatusChange
|
||||
*/
|
||||
/* If CurrentConnectStatus is cleared we set ConnectStatusChange */
|
||||
if (!(ohci->rhport[i].ctrl & OHCI_PORT_CCS)) {
|
||||
ohci->rhport[i].ctrl |= OHCI_PORT_CSC;
|
||||
if (ohci->rhstatus & OHCI_RHS_DRWE) {
|
||||
|
|
@ -1291,7 +1294,7 @@ static int ohci_port_set_if_connected(OHCIState *ohci, int i, uint32_t val)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/* Set the frame interval - frame interval toggle is manipulated by the hcd only */
|
||||
/* Frame interval toggle is manipulated by the hcd only */
|
||||
static void ohci_set_frame_interval(OHCIState *ohci, uint16_t val)
|
||||
{
|
||||
val &= OHCI_FMI_FI;
|
||||
|
|
@ -1357,9 +1360,7 @@ static uint32_t ohci_get_frame_remaining(OHCIState *ohci)
|
|||
if ((ohci->ctl & OHCI_CTL_HCFS) != OHCI_USB_OPERATIONAL)
|
||||
return (ohci->frt << 31);
|
||||
|
||||
/* Being in USB operational state guarnatees sof_time was
|
||||
* set already.
|
||||
*/
|
||||
/* Being in USB operational state guarnatees sof_time was set already. */
|
||||
tks = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) - ohci->sof_time;
|
||||
if (tks < 0) {
|
||||
tks = 0;
|
||||
|
|
@ -1443,9 +1444,7 @@ static void ohci_port_set_status(OHCIState *ohci, int portnum, uint32_t val)
|
|||
port->ctrl |= OHCI_PORT_PES | OHCI_PORT_PRSC;
|
||||
}
|
||||
|
||||
/* Invert order here to ensure in ambiguous case, device is
|
||||
* powered up...
|
||||
*/
|
||||
/* Invert order here to ensure in ambiguous case, device is powered up. */
|
||||
if (val & OHCI_PORT_LSDA)
|
||||
ohci_port_power(ohci, portnum, 0);
|
||||
if (val & OHCI_PORT_PPS)
|
||||
|
|
@ -1892,7 +1891,7 @@ void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports,
|
|||
ohci_frame_boundary, ohci);
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* A typical OHCI will stop operating and set itself into error state
|
||||
* (which can be queried by MMIO) to signal that it got an error.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue