tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: Remove trailing whitespaces

Browse Source 
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Elyes Haouas 2022-03-04 07:41:55 +01:00 committed by Daniel Kiper
parent c216df4036
commit b3897585dd
13 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
grub-core/bus/bonito.c
View File

@ -21,12 +21,12 @@
#include <grub/misc.h> #include <grub/misc.h>
static grub_uint32_t base_win[GRUB_MACHINE_PCI_NUM_WIN]; static grub_uint32_t base_win[GRUB_MACHINE_PCI_NUM_WIN];
static const grub_size_t sizes_win[GRUB_MACHINE_PCI_NUM_WIN] = static const grub_size_t sizes_win[GRUB_MACHINE_PCI_NUM_WIN] =
{GRUB_MACHINE_PCI_WIN1_SIZE, GRUB_MACHINE_PCI_WIN_SIZE, {GRUB_MACHINE_PCI_WIN1_SIZE, GRUB_MACHINE_PCI_WIN_SIZE,
GRUB_MACHINE_PCI_WIN_SIZE}; GRUB_MACHINE_PCI_WIN_SIZE};
/* Usage counters. */ /* Usage counters. */
static int usage_win[GRUB_MACHINE_PCI_NUM_WIN]; static int usage_win[GRUB_MACHINE_PCI_NUM_WIN];
static grub_addr_t addr_win[GRUB_MACHINE_PCI_NUM_WIN] = static grub_addr_t addr_win[GRUB_MACHINE_PCI_NUM_WIN] =
{GRUB_MACHINE_PCI_WIN1_ADDR, GRUB_MACHINE_PCI_WIN2_ADDR, {GRUB_MACHINE_PCI_WIN1_ADDR, GRUB_MACHINE_PCI_WIN2_ADDR,
GRUB_MACHINE_PCI_WIN3_ADDR}; GRUB_MACHINE_PCI_WIN3_ADDR};
@ -93,9 +93,9 @@ write_bases_2f (void)
{ {
int i; int i;
grub_uint32_t reg = 0; grub_uint32_t reg = 0;
for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++) for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
reg |= (((base_win[i] >> GRUB_MACHINE_PCI_WIN_SHIFT) reg |= (((base_win[i] >> GRUB_MACHINE_PCI_WIN_SHIFT)
& GRUB_MACHINE_PCI_WIN_MASK) & GRUB_MACHINE_PCI_WIN_MASK)
<< (i * GRUB_MACHINE_PCI_WIN_MASK_SIZE)); << (i * GRUB_MACHINE_PCI_WIN_MASK_SIZE));
GRUB_MACHINE_PCI_IO_CTRL_REG_2F = reg; GRUB_MACHINE_PCI_IO_CTRL_REG_2F = reg;
} }
@ -111,23 +111,23 @@ grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
/* First try already used registers. */ /* First try already used registers. */
for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++) for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
if (usage_win[i] && base_win[i] <= base if (usage_win[i] && base_win[i] <= base
&& base_win[i] + sizes_win[i] > base + size) && base_win[i] + sizes_win[i] > base + size)
{ {
usage_win[i]++; usage_win[i]++;
return (void *) return (void *)
(addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK)); (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
} }
/* Map new register. */ /* Map new register. */
newbase = base & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK; newbase = base & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK;
for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++) for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
if (!usage_win[i] && newbase <= base if (!usage_win[i] && newbase <= base
&& newbase + sizes_win[i] > base + size) && newbase + sizes_win[i] > base + size)
{ {
usage_win[i]++; usage_win[i]++;
base_win[i] = newbase; base_win[i] = newbase;
write_bases_2f (); write_bases_2f ();
return (void *) return (void *)
(addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK)); (addr_win[i] | (base & GRUB_MACHINE_PCI_WIN_OFFSET_MASK));
} }
grub_fatal ("Out of PCI windows."); grub_fatal ("Out of PCI windows.");
@ -164,7 +164,7 @@ grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
{ {
int i; int i;
for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++) for (i = 0; i < GRUB_MACHINE_PCI_NUM_WIN; i++)
if (usage_win[i] && addr_win[i] if (usage_win[i] && addr_win[i]
== (((grub_addr_t) mem | 0x20000000) == (((grub_addr_t) mem | 0x20000000)
& ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK)) & ~GRUB_MACHINE_PCI_WIN_OFFSET_MASK))
{ {

22
grub-core/bus/cs5536.c
View File

@ -72,7 +72,7 @@ grub_cs5536_read_msr (grub_pci_device_t dev, grub_uint32_t addr)
addr); addr);
ret = (grub_uint64_t) ret = (grub_uint64_t)
grub_pci_read (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA0)); grub_pci_read (grub_pci_make_address (dev, GRUB_CS5536_MSR_MAILBOX_DATA0));
ret |= (((grub_uint64_t) ret |= (((grub_uint64_t)
grub_pci_read (grub_pci_make_address (dev, grub_pci_read (grub_pci_make_address (dev,
GRUB_CS5536_MSR_MAILBOX_DATA1))) GRUB_CS5536_MSR_MAILBOX_DATA1)))
<< 32); << 32);
@ -100,7 +100,7 @@ grub_cs5536_smbus_wait (grub_port_t smbbase)
grub_uint8_t status; grub_uint8_t status;
status = grub_inb (smbbase + GRUB_CS5536_SMB_REG_STATUS); status = grub_inb (smbbase + GRUB_CS5536_SMB_REG_STATUS);
if (status & GRUB_CS5536_SMB_REG_STATUS_SDAST) if (status & GRUB_CS5536_SMB_REG_STATUS_SDAST)
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
if (status & GRUB_CS5536_SMB_REG_STATUS_BER) if (status & GRUB_CS5536_SMB_REG_STATUS_BER)
return grub_error (GRUB_ERR_IO, "SM bus error"); return grub_error (GRUB_ERR_IO, "SM bus error");
if (status & GRUB_CS5536_SMB_REG_STATUS_NACK) if (status & GRUB_CS5536_SMB_REG_STATUS_NACK)
@ -122,8 +122,8 @@ grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
smbbase + GRUB_CS5536_SMB_REG_CTRL1); smbbase + GRUB_CS5536_SMB_REG_CTRL1);
/* Send device address. */ /* Send device address. */
err = grub_cs5536_smbus_wait (smbbase); err = grub_cs5536_smbus_wait (smbbase);
if (err) if (err)
return err; return err;
grub_outb (dev << 1, smbbase + GRUB_CS5536_SMB_REG_DATA); grub_outb (dev << 1, smbbase + GRUB_CS5536_SMB_REG_DATA);
@ -139,8 +139,8 @@ grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
grub_outb (addr, smbbase + GRUB_CS5536_SMB_REG_DATA); grub_outb (addr, smbbase + GRUB_CS5536_SMB_REG_DATA);
/* Send START. */ /* Send START. */
err = grub_cs5536_smbus_wait (smbbase); err = grub_cs5536_smbus_wait (smbbase);
if (err) if (err)
return err; return err;
grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1) grub_outb (grub_inb (smbbase + GRUB_CS5536_SMB_REG_CTRL1)
| GRUB_CS5536_SMB_REG_CTRL1_START, | GRUB_CS5536_SMB_REG_CTRL1_START,
@ -161,7 +161,7 @@ grub_cs5536_read_spd_byte (grub_port_t smbbase, grub_uint8_t dev,
smbbase + GRUB_CS5536_SMB_REG_CTRL1); smbbase + GRUB_CS5536_SMB_REG_CTRL1);
err = grub_cs5536_smbus_wait (smbbase); err = grub_cs5536_smbus_wait (smbbase);
if (err) if (err)
return err; return err;
*res = grub_inb (smbbase + GRUB_CS5536_SMB_REG_DATA); *res = grub_inb (smbbase + GRUB_CS5536_SMB_REG_DATA);
@ -198,8 +198,8 @@ grub_cs5536_init_smbus (grub_pci_device_t dev, grub_uint16_t divisor,
grub_outb (((divisor >> 7) & 0xff), *smbbase + GRUB_CS5536_SMB_REG_CTRL3); grub_outb (((divisor >> 7) & 0xff), *smbbase + GRUB_CS5536_SMB_REG_CTRL3);
grub_outb (((divisor << 1) & 0xfe) | GRUB_CS5536_SMB_REG_CTRL2_ENABLE, grub_outb (((divisor << 1) & 0xfe) | GRUB_CS5536_SMB_REG_CTRL2_ENABLE,
*smbbase + GRUB_CS5536_SMB_REG_CTRL2); *smbbase + GRUB_CS5536_SMB_REG_CTRL2);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
grub_err_t grub_err_t
@ -217,7 +217,7 @@ grub_cs5536_read_spd (grub_port_t smbbase, grub_uint8_t dev,
if (b == 0) if (b == 0)
return grub_error (GRUB_ERR_IO, "no SPD found"); return grub_error (GRUB_ERR_IO, "no SPD found");
size = b; size = b;
((grub_uint8_t *) res)[0] = b; ((grub_uint8_t *) res)[0] = b;
for (ptr = 1; ptr < size; ptr++) for (ptr = 1; ptr < size; ptr++)
{ {
@ -310,7 +310,7 @@ grub_cs5536_init_geode (grub_pci_device_t dev)
/* Initialise USB controller. */ /* Initialise USB controller. */
/* FIXME: assign adresses dynamically. */ /* FIXME: assign adresses dynamically. */
grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE, grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_USB_OHCI_BASE,
GRUB_CS5536_MSR_USB_BASE_BUS_MASTER GRUB_CS5536_MSR_USB_BASE_BUS_MASTER
| GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE | GRUB_CS5536_MSR_USB_BASE_MEMORY_ENABLE
| 0x05024000); | 0x05024000);

4
grub-core/bus/pci.c
View File

@ -159,12 +159,12 @@ grub_pci_find_capability (grub_pci_device_t dev, grub_uint8_t cap)
pos &= ~3; pos &= ~3;
addr = grub_pci_make_address (dev, pos); addr = grub_pci_make_address (dev, pos);
id = grub_pci_read_byte (addr); id = grub_pci_read_byte (addr);
if (id == 0xff) if (id == 0xff)
break; break;
if (id == cap) if (id == cap)
return pos; return pos;
pos++; pos++;

6
grub-core/bus/usb/ehci-pci.c
View File

@ -96,7 +96,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
return 0; return 0;
} }
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: bus rev. num. OK\n"); grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: bus rev. num. OK\n");
/* Determine EHCI EHCC registers base address. */ /* Determine EHCI EHCC registers base address. */
addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0); addr = grub_pci_make_address (dev, GRUB_PCI_REG_ADDRESS_REG0);
base = grub_pci_read (addr); base = grub_pci_read (addr);
@ -125,7 +125,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
GRUB_PCI_COMMAND_MEM_ENABLED GRUB_PCI_COMMAND_MEM_ENABLED
| GRUB_PCI_COMMAND_BUS_MASTER | GRUB_PCI_COMMAND_BUS_MASTER
| grub_pci_read_word(addr)); | grub_pci_read_word(addr));
grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n"); grub_dprintf ("ehci", "EHCI grub_ehci_pci_iter: 32-bit EHCI OK\n");
} }
@ -142,7 +142,7 @@ grub_ehci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
/* Determine and change ownership. */ /* Determine and change ownership. */
/* EECP offset valid in HCCPARAMS */ /* EECP offset valid in HCCPARAMS */
/* Ownership can be changed via EECP only */ /* Ownership can be changed via EECP only */
if (pciid != GRUB_CS5536_PCIID && eecp_offset >= 0x40) if (pciid != GRUB_CS5536_PCIID && eecp_offset >= 0x40)
{ {
grub_pci_address_t pciaddr_eecp; grub_pci_address_t pciaddr_eecp;
pciaddr_eecp = grub_pci_make_address (dev, eecp_offset); pciaddr_eecp = grub_pci_make_address (dev, eecp_offset);

8
grub-core/bus/usb/ehci.c
View File

@ -498,8 +498,8 @@ grub_ehci_init_device (volatile void *regs)
} }
e->iobase = ((volatile grub_uint32_t *) e->iobase_ehcc e->iobase = ((volatile grub_uint32_t *) e->iobase_ehcc
+ (caplen / sizeof (grub_uint32_t))); + (caplen / sizeof (grub_uint32_t)));
#else #else
e->iobase = (volatile grub_uint32_t *) e->iobase = (volatile grub_uint32_t *)
((grub_uint8_t *) e->iobase_ehcc + caplen); ((grub_uint8_t *) e->iobase_ehcc + caplen);
#endif #endif
@ -869,7 +869,7 @@ grub_ehci_find_qh (struct grub_ehci *e, grub_usb_transfer_t transfer)
i++ ) i++ )
{ {
if (target == (qh_iter->ep_char & mask)) if (target == (qh_iter->ep_char & mask))
{ {
/* Found proper existing (and linked) QH, do setup of QH */ /* Found proper existing (and linked) QH, do setup of QH */
grub_dprintf ("ehci", "find_qh: found, QH=%p\n", qh_iter); grub_dprintf ("ehci", "find_qh: found, QH=%p\n", qh_iter);
grub_ehci_setup_qh (qh_iter, transfer); grub_ehci_setup_qh (qh_iter, transfer);
@ -1813,7 +1813,7 @@ static struct grub_usb_controller_dev usb_controller = {
.portstatus = grub_ehci_portstatus, .portstatus = grub_ehci_portstatus,
.detect_dev = grub_ehci_detect_dev, .detect_dev = grub_ehci_detect_dev,
/* estimated max. count of TDs for one bulk transfer */ /* estimated max. count of TDs for one bulk transfer */
.max_bulk_tds = GRUB_EHCI_N_TD * 3 / 4 .max_bulk_tds = GRUB_EHCI_N_TD * 3 / 4
}; };
GRUB_MOD_INIT (ehci) GRUB_MOD_INIT (ehci)

54
grub-core/bus/usb/ohci.c
View File

@ -196,7 +196,7 @@ grub_ohci_td_virt2phys (struct grub_ohci *o, grub_ohci_td_t x)
return (grub_uint8_t *)x - (grub_uint8_t *)o->td + o->td_addr; return (grub_uint8_t *)x - (grub_uint8_t *)o->td + o->td_addr;
} }
static grub_uint32_t static grub_uint32_t
grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg) grub_ohci_readreg32 (struct grub_ohci *o, grub_ohci_reg_t reg)
{ {
@ -224,7 +224,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
struct grub_ohci *o; struct grub_ohci *o;
grub_uint32_t revision; grub_uint32_t revision;
int j; int j;
/* Determine IO base address. */ /* Determine IO base address. */
grub_dprintf ("ohci", "pciid = %x\n", pciid); grub_dprintf ("ohci", "pciid = %x\n", pciid);
@ -253,7 +253,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS); addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
class_code = grub_pci_read (addr) >> 8; class_code = grub_pci_read (addr) >> 8;
interf = class_code & 0xFF; interf = class_code & 0xFF;
subclass = (class_code >> 8) & 0xFF; subclass = (class_code >> 8) & 0xFF;
class = class_code >> 16; class = class_code >> 16;
@ -315,7 +315,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
* GRUB_OHCI_CTRL_EDS); * GRUB_OHCI_CTRL_EDS);
for (j=0; j < GRUB_OHCI_CTRL_EDS; j++) for (j=0; j < GRUB_OHCI_CTRL_EDS; j++)
o->ed_ctrl[j].target = grub_cpu_to_le32_compile_time (1 << 14); /* skip */ o->ed_ctrl[j].target = grub_cpu_to_le32_compile_time (1 << 14); /* skip */
grub_dprintf ("ohci", "EDs-C: chunk=%p, virt=%p, phys=0x%02x\n", grub_dprintf ("ohci", "EDs-C: chunk=%p, virt=%p, phys=0x%02x\n",
o->ed_ctrl_chunk, o->ed_ctrl, o->ed_ctrl_addr); o->ed_ctrl_chunk, o->ed_ctrl, o->ed_ctrl_addr);
@ -385,7 +385,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
grub_dprintf("ohci", "Ownership changing timeout, change forced !\n"); grub_dprintf("ohci", "Ownership changing timeout, change forced !\n");
} }
} }
else if (((control & 0x100) == 0) && else if (((control & 0x100) == 0) &&
((control & 0xc0) != 0)) /* Not owned by SMM nor reset */ ((control & 0xc0) != 0)) /* Not owned by SMM nor reset */
{ {
grub_dprintf("ohci", "OHCI is owned by BIOS\n"); grub_dprintf("ohci", "OHCI is owned by BIOS\n");
@ -396,7 +396,7 @@ grub_ohci_pci_iter (grub_pci_device_t dev, grub_pci_id_t pciid,
{ {
grub_dprintf("ohci", "OHCI is not owned by SMM nor BIOS\n"); grub_dprintf("ohci", "OHCI is not owned by SMM nor BIOS\n");
/* We can setup OHCI. */ /* We can setup OHCI. */
} }
} }
/* Suspend the OHCI by issuing a reset. */ /* Suspend the OHCI by issuing a reset. */
@ -513,7 +513,7 @@ grub_ohci_find_ed (struct grub_ohci *o, int bulk, grub_uint32_t target)
/* Use proper values and structures. */ /* Use proper values and structures. */
if (bulk) if (bulk)
{ {
count = GRUB_OHCI_BULK_EDS; count = GRUB_OHCI_BULK_EDS;
ed = o->ed_bulk; ed = o->ed_bulk;
ed_next = grub_ohci_ed_phys2virt(o, bulk, ed_next = grub_ohci_ed_phys2virt(o, bulk,
@ -576,7 +576,7 @@ grub_ohci_alloc_td (struct grub_ohci *o)
static void static void
grub_ohci_free_td (struct grub_ohci *o, grub_ohci_td_t td) grub_ohci_free_td (struct grub_ohci *o, grub_ohci_td_t td)
{ {
grub_memset ( (void*)td, 0, sizeof(struct grub_ohci_td) ); grub_memset ( (void*)td, 0, sizeof(struct grub_ohci_td) );
td->link_td = o->td_free; /* Cahin new free TD & rest */ td->link_td = o->td_free; /* Cahin new free TD & rest */
o->td_free = td; /* Change address of first free TD */ o->td_free = td; /* Change address of first free TD */
} }
@ -586,7 +586,7 @@ grub_ohci_free_tds (struct grub_ohci *o, grub_ohci_td_t td)
{ {
if (!td) if (!td)
return; return;
/* Unchain first TD from previous TD if it is chained */ /* Unchain first TD from previous TD if it is chained */
if (td->prev_td_phys) if (td->prev_td_phys)
{ {
@ -596,12 +596,12 @@ grub_ohci_free_tds (struct grub_ohci *o, grub_ohci_td_t td)
if (td == (grub_ohci_td_t) td_prev_virt->link_td) if (td == (grub_ohci_td_t) td_prev_virt->link_td)
td_prev_virt->link_td = 0; td_prev_virt->link_td = 0;
} }
/* Free all TDs from td (chained by link_td) */ /* Free all TDs from td (chained by link_td) */
while (td) while (td)
{ {
grub_ohci_td_t tdprev; grub_ohci_td_t tdprev;
/* Unlink the queue. */ /* Unlink the queue. */
tdprev = td; tdprev = td;
td = (grub_ohci_td_t) td->link_td; td = (grub_ohci_td_t) td->link_td;
@ -658,7 +658,7 @@ grub_ohci_transaction (grub_ohci_td_t td,
td->buffer = grub_cpu_to_le32 (buffer); td->buffer = grub_cpu_to_le32 (buffer);
td->buffer_end = grub_cpu_to_le32 (buffer_end); td->buffer_end = grub_cpu_to_le32 (buffer_end);
} }
else else
{ {
td->buffer = 0; td->buffer = 0;
td->buffer_end = 0; td->buffer_end = 0;
@ -728,7 +728,7 @@ grub_ohci_setup_transfer (grub_usb_controller_t dev,
grub_free (cdata); grub_free (cdata);
return GRUB_USB_ERR_INTERNAL; return GRUB_USB_ERR_INTERNAL;
} }
/* Take pointer to first TD from ED */ /* Take pointer to first TD from ED */
td_head_phys = grub_le_to_cpu32 (cdata->ed_virt->td_head) & ~0xf; td_head_phys = grub_le_to_cpu32 (cdata->ed_virt->td_head) & ~0xf;
td_tail_phys = grub_le_to_cpu32 (cdata->ed_virt->td_tail) & ~0xf; td_tail_phys = grub_le_to_cpu32 (cdata->ed_virt->td_tail) & ~0xf;
@ -743,7 +743,7 @@ grub_ohci_setup_transfer (grub_usb_controller_t dev,
grub_free (cdata); grub_free (cdata);
return GRUB_USB_ERR_INTERNAL; return GRUB_USB_ERR_INTERNAL;
} }
/* Now we should handle first TD. If ED is newly allocated, /* Now we should handle first TD. If ED is newly allocated,
* we must allocate the first TD. */ * we must allocate the first TD. */
if (!td_head_phys) if (!td_head_phys)
@ -762,7 +762,7 @@ grub_ohci_setup_transfer (grub_usb_controller_t dev,
} }
else else
cdata->td_head_virt = grub_ohci_td_phys2virt ( o, td_head_phys ); cdata->td_head_virt = grub_ohci_td_phys2virt ( o, td_head_phys );
/* Set TDs */ /* Set TDs */
cdata->td_last_phys = td_head_phys; /* initial value to make compiler happy... */ cdata->td_last_phys = td_head_phys; /* initial value to make compiler happy... */
for (i = 0, cdata->td_current_virt = cdata->td_head_virt; for (i = 0, cdata->td_current_virt = cdata->td_head_virt;
@ -775,10 +775,10 @@ grub_ohci_setup_transfer (grub_usb_controller_t dev,
/* Set index of TD in transfer */ /* Set index of TD in transfer */
cdata->td_current_virt->tr_index = (grub_uint32_t) i; cdata->td_current_virt->tr_index = (grub_uint32_t) i;
/* Remember last used (processed) TD phys. addr. */ /* Remember last used (processed) TD phys. addr. */
cdata->td_last_phys = grub_ohci_td_virt2phys (o, cdata->td_current_virt); cdata->td_last_phys = grub_ohci_td_virt2phys (o, cdata->td_current_virt);
/* Allocate next TD */ /* Allocate next TD */
td_next_virt = grub_ohci_alloc_td (o); td_next_virt = grub_ohci_alloc_td (o);
if (!td_next_virt) /* No free TD, cancel transfer and free TDs except head TD */ if (!td_next_virt) /* No free TD, cancel transfer and free TDs except head TD */
@ -807,7 +807,7 @@ grub_ohci_setup_transfer (grub_usb_controller_t dev,
grub_dprintf ("ohci", "Tail TD (not processed) = %p\n", grub_dprintf ("ohci", "Tail TD (not processed) = %p\n",
cdata->td_current_virt); cdata->td_current_virt);
/* Setup the Endpoint Descriptor for transfer. */ /* Setup the Endpoint Descriptor for transfer. */
/* First set necessary fields in TARGET but keep (or set) skip bit */ /* First set necessary fields in TARGET but keep (or set) skip bit */
/* Note: It could be simpler if speed, format and max. packet /* Note: It could be simpler if speed, format and max. packet
@ -923,7 +923,7 @@ finish_transfer (grub_usb_controller_t dev,
struct grub_ohci_transfer_controller_data *cdata = transfer->controller_data; struct grub_ohci_transfer_controller_data *cdata = transfer->controller_data;
/* Set empty ED - set HEAD = TAIL = last (not processed) TD */ /* Set empty ED - set HEAD = TAIL = last (not processed) TD */
cdata->ed_virt->td_head = grub_cpu_to_le32 (grub_le_to_cpu32 (cdata->ed_virt->td_tail) & ~0xf); cdata->ed_virt->td_head = grub_cpu_to_le32 (grub_le_to_cpu32 (cdata->ed_virt->td_tail) & ~0xf);
/* At this point always should be: /* At this point always should be:
* ED has skip bit set and halted or empty or after next SOF, * ED has skip bit set and halted or empty or after next SOF,
@ -935,7 +935,7 @@ finish_transfer (grub_usb_controller_t dev,
{ {
grub_ohci_td_t td_prev_virt grub_ohci_td_t td_prev_virt
= grub_ohci_td_phys2virt (o, cdata->td_current_virt->prev_td_phys); = grub_ohci_td_phys2virt (o, cdata->td_current_virt->prev_td_phys);
if (cdata->td_current_virt == (grub_ohci_td_t) td_prev_virt->link_td) if (cdata->td_current_virt == (grub_ohci_td_t) td_prev_virt->link_td)
td_prev_virt->link_td = 0; td_prev_virt->link_td = 0;
@ -978,7 +978,7 @@ parse_halt (grub_usb_controller_t dev,
} }
else else
transfer->last_trans = -1; transfer->last_trans = -1;
/* Evaluation of error code */ /* Evaluation of error code */
grub_dprintf ("ohci", "OHCI tderr_phys=0x%02x, errcode=0x%02x\n", grub_dprintf ("ohci", "OHCI tderr_phys=0x%02x, errcode=0x%02x\n",
cdata->tderr_phys, errcode); cdata->tderr_phys, errcode);
@ -1089,7 +1089,7 @@ parse_success (grub_usb_controller_t dev,
/* Prepare pointer to last processed TD */ /* Prepare pointer to last processed TD */
tderr_virt = grub_ohci_td_phys2virt (o, cdata->tderr_phys); tderr_virt = grub_ohci_td_phys2virt (o, cdata->tderr_phys);
/* Set index of last processed TD */ /* Set index of last processed TD */
if (tderr_virt) if (tderr_virt)
transfer->last_trans = tderr_virt->tr_index; transfer->last_trans = tderr_virt->tr_index;
@ -1207,7 +1207,7 @@ grub_ohci_cancel_transfer (grub_usb_controller_t dev,
cdata->tderr_phys cdata->tderr_phys
= grub_ohci_td_phys2virt (o, grub_le_to_cpu32 (cdata->ed_virt->td_head) = grub_ohci_td_phys2virt (o, grub_le_to_cpu32 (cdata->ed_virt->td_head)
& ~0xf)->prev_td_phys; & ~0xf)->prev_td_phys;
tderr_virt = grub_ohci_td_phys2virt (o,cdata-> tderr_phys); tderr_virt = grub_ohci_td_phys2virt (o,cdata-> tderr_phys);
grub_dprintf ("ohci", "Cancel: tderr_phys=0x%x, tderr_virt=%p\n", grub_dprintf ("ohci", "Cancel: tderr_phys=0x%x, tderr_virt=%p\n",
@ -1249,7 +1249,7 @@ grub_ohci_portstatus (grub_usb_controller_t dev,
grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port)); grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port));
return GRUB_USB_ERR_NONE; return GRUB_USB_ERR_NONE;
} }
/* OHCI does one reset signal 10ms long but USB spec. /* OHCI does one reset signal 10ms long but USB spec.
* requests 50ms for root hub (no need to be continuous). * requests 50ms for root hub (no need to be continuous).
* So, we do reset 5 times... */ * So, we do reset 5 times... */
@ -1276,7 +1276,7 @@ grub_ohci_portstatus (grub_usb_controller_t dev,
grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port, grub_ohci_writereg32 (o, GRUB_OHCI_REG_RHUBPORT + port,
GRUB_OHCI_SET_PORT_ENABLE); GRUB_OHCI_SET_PORT_ENABLE);
grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port); grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port);
/* Wait for signal enabled */ /* Wait for signal enabled */
endtime = grub_get_time_ms () + 1000; endtime = grub_get_time_ms () + 1000;
while (! (grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port) while (! (grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port)
@ -1290,10 +1290,10 @@ grub_ohci_portstatus (grub_usb_controller_t dev,
/* "Reset recovery time" (USB spec.) */ /* "Reset recovery time" (USB spec.) */
grub_millisleep (10); grub_millisleep (10);
grub_dprintf ("ohci", "end of portstatus=0x%02x\n", grub_dprintf ("ohci", "end of portstatus=0x%02x\n",
grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port)); grub_ohci_readreg32 (o, GRUB_OHCI_REG_RHUBPORT + port));
return GRUB_USB_ERR_NONE; return GRUB_USB_ERR_NONE;
} }

2
grub-core/bus/usb/serial/common.c
View File

@ -93,7 +93,7 @@ grub_usbserial_attach (grub_usb_device_t usbdev, int configno, int interfno,
/* Configure device */ /* Configure device */
if (port->out_endp && port->in_endp) if (port->out_endp && port->in_endp)
err = grub_usb_set_configuration (usbdev, configno + 1); err = grub_usb_set_configuration (usbdev, configno + 1);
if (!port->out_endp || !port->in_endp || err) if (!port->out_endp || !port->in_endp || err)
{ {
grub_free (port->name); grub_free (port->name);

2
grub-core/bus/usb/serial/ftdi.c
View File

@ -174,7 +174,7 @@ static struct grub_serial_driver grub_ftdi_driver =
.fini = grub_usbserial_fini .fini = grub_usbserial_fini
}; };
static const struct static const struct
{ {
grub_uint16_t vendor, product; grub_uint16_t vendor, product;
} products[] = } products[] =

2
grub-core/bus/usb/serial/pl2303.c
View File

@ -187,7 +187,7 @@ static struct grub_serial_driver grub_pl2303_driver =
.fini = grub_usbserial_fini .fini = grub_usbserial_fini
}; };
static const struct static const struct
{ {
grub_uint16_t vendor, product; grub_uint16_t vendor, product;
} products[] = } products[] =

32
grub-core/bus/usb/uhci.c
View File

@ -244,10 +244,10 @@ grub_uhci_pci_iter (grub_pci_device_t dev,
u->iobase = (base & GRUB_UHCI_IOMASK) + GRUB_MACHINE_PCI_IO_BASE; u->iobase = (base & GRUB_UHCI_IOMASK) + GRUB_MACHINE_PCI_IO_BASE;
/* Reset PIRQ and SMI */ /* Reset PIRQ and SMI */
addr = grub_pci_make_address (dev, GRUB_UHCI_REG_USBLEGSUP); addr = grub_pci_make_address (dev, GRUB_UHCI_REG_USBLEGSUP);
grub_pci_write_word(addr, GRUB_UHCI_RESET_LEGSUP_SMI); grub_pci_write_word(addr, GRUB_UHCI_RESET_LEGSUP_SMI);
/* Reset the HC */ /* Reset the HC */
grub_uhci_writereg16(u, GRUB_UHCI_REG_USBCMD, GRUB_UHCI_CMD_HCRESET); grub_uhci_writereg16(u, GRUB_UHCI_REG_USBCMD, GRUB_UHCI_CMD_HCRESET);
grub_millisleep(5); grub_millisleep(5);
/* Disable interrupts and commands (just to be safe) */ /* Disable interrupts and commands (just to be safe) */
grub_uhci_writereg16(u, GRUB_UHCI_REG_USBINTR, 0); grub_uhci_writereg16(u, GRUB_UHCI_REG_USBINTR, 0);
@ -399,7 +399,7 @@ grub_free_queue (struct grub_uhci *u, grub_uhci_qh_t qh, grub_uhci_td_t td,
u->qh_busy[qh - u->qh_virt] = 0; u->qh_busy[qh - u->qh_virt] = 0;
*actual = 0; *actual = 0;
/* Free the TDs in this queue and set last_trans. */ /* Free the TDs in this queue and set last_trans. */
for (i=0; td; i++) for (i=0; td; i++)
{ {
@ -411,7 +411,7 @@ grub_free_queue (struct grub_uhci *u, grub_uhci_qh_t qh, grub_uhci_td_t td,
transfer->last_trans = i; transfer->last_trans = i;
*actual += (td->ctrl_status + 1) & 0x7ff; *actual += (td->ctrl_status + 1) & 0x7ff;
/* Unlink the queue. */ /* Unlink the queue. */
tdprev = td; tdprev = td;
if (!td->linkptr2) if (!td->linkptr2)
@ -537,7 +537,7 @@ grub_uhci_setup_transfer (grub_usb_controller_t dev,
} }
grub_dprintf ("uhci", "transfer, iobase:%08x\n", u->iobase); grub_dprintf ("uhci", "transfer, iobase:%08x\n", u->iobase);
for (i = 0; i < transfer->transcnt; i++) for (i = 0; i < transfer->transcnt; i++)
{ {
grub_usb_transaction_t tr = &transfer->transactions[i]; grub_usb_transaction_t tr = &transfer->transactions[i];
@ -604,7 +604,7 @@ grub_uhci_check_transfer (grub_usb_controller_t dev,
errtd = grub_dma_phys2virt (cdata->qh->elinkptr & ~0x0f, u->qh_chunk); errtd = grub_dma_phys2virt (cdata->qh->elinkptr & ~0x0f, u->qh_chunk);
else else
errtd = 0; errtd = 0;
if (errtd) if (errtd)
{ {
grub_dprintf ("uhci", ">t status=0x%02x data=0x%02x td=%p, %x\n", grub_dprintf ("uhci", ">t status=0x%02x data=0x%02x td=%p, %x\n",
@ -632,27 +632,27 @@ grub_uhci_check_transfer (grub_usb_controller_t dev,
/* Check if the endpoint is stalled. */ /* Check if the endpoint is stalled. */
if (errtd->ctrl_status & (1 << 22)) if (errtd->ctrl_status & (1 << 22))
err = GRUB_USB_ERR_STALL; err = GRUB_USB_ERR_STALL;
/* Check if an error related to the data buffer occurred. */ /* Check if an error related to the data buffer occurred. */
else if (errtd->ctrl_status & (1 << 21)) else if (errtd->ctrl_status & (1 << 21))
err = GRUB_USB_ERR_DATA; err = GRUB_USB_ERR_DATA;
/* Check if a babble error occurred. */ /* Check if a babble error occurred. */
else if (errtd->ctrl_status & (1 << 20)) else if (errtd->ctrl_status & (1 << 20))
err = GRUB_USB_ERR_BABBLE; err = GRUB_USB_ERR_BABBLE;
/* Check if a NAK occurred. */ /* Check if a NAK occurred. */
else if (errtd->ctrl_status & (1 << 19)) else if (errtd->ctrl_status & (1 << 19))
err = GRUB_USB_ERR_NAK; err = GRUB_USB_ERR_NAK;
/* Check if a timeout occurred. */ /* Check if a timeout occurred. */
else if (errtd->ctrl_status & (1 << 18)) else if (errtd->ctrl_status & (1 << 18))
err = GRUB_USB_ERR_TIMEOUT; err = GRUB_USB_ERR_TIMEOUT;
/* Check if a bitstuff error occurred. */ /* Check if a bitstuff error occurred. */
else if (errtd->ctrl_status & (1 << 17)) else if (errtd->ctrl_status & (1 << 17))
err = GRUB_USB_ERR_BITSTUFF; err = GRUB_USB_ERR_BITSTUFF;
if (err) if (err)
{ {
grub_dprintf ("uhci", "transaction failed\n"); grub_dprintf ("uhci", "transaction failed\n");
@ -719,7 +719,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
grub_uint64_t endtime; grub_uint64_t endtime;
grub_dprintf ("uhci", "portstatus, iobase:%08x\n", u->iobase); grub_dprintf ("uhci", "portstatus, iobase:%08x\n", u->iobase);
grub_dprintf ("uhci", "enable=%d port=%d\n", enable, port); grub_dprintf ("uhci", "enable=%d port=%d\n", enable, port);
if (port == 0) if (port == 0)
@ -746,7 +746,7 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
grub_dprintf ("uhci", ">3detect=0x%02x\n", status); grub_dprintf ("uhci", ">3detect=0x%02x\n", status);
return GRUB_USB_ERR_NONE; return GRUB_USB_ERR_NONE;
} }
/* Reset the port. */ /* Reset the port. */
status = grub_uhci_readreg16 (u, reg) & ~GRUB_UHCI_PORTSC_RWC; status = grub_uhci_readreg16 (u, reg) & ~GRUB_UHCI_PORTSC_RWC;
grub_uhci_writereg16 (u, reg, status | (1 << 9)); grub_uhci_writereg16 (u, reg, status | (1 << 9));
@ -796,7 +796,7 @@ grub_uhci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
unsigned int status; unsigned int status;
grub_dprintf ("uhci", "detect_dev, iobase:%08x\n", u->iobase); grub_dprintf ("uhci", "detect_dev, iobase:%08x\n", u->iobase);
if (port == 0) if (port == 0)
reg = GRUB_UHCI_REG_PORTSC1; reg = GRUB_UHCI_REG_PORTSC1;
else if (port == 1) else if (port == 1)
@ -818,7 +818,7 @@ grub_uhci_detect_dev (grub_usb_controller_t dev, int port, int *changed)
} }
else else
*changed = 0; *changed = 0;
if (! (status & GRUB_UHCI_DETECT_HAVE_DEVICE)) if (! (status & GRUB_UHCI_DETECT_HAVE_DEVICE))
return GRUB_USB_SPEED_NONE; return GRUB_USB_SPEED_NONE;
else if (status & GRUB_UHCI_DETECT_LOW_SPEED) else if (status & GRUB_UHCI_DETECT_LOW_SPEED)

6
grub-core/bus/usb/usb.c
View File

@ -144,7 +144,7 @@ grub_usb_device_initialize (grub_usb_device_t dev)
{ {
err = GRUB_USB_ERR_BADDEVICE; err = GRUB_USB_ERR_BADDEVICE;
goto fail; goto fail;
} }
for (i = 0; i < descdev->configcnt; i++) for (i = 0; i < descdev->configcnt; i++)
{ {
@ -235,7 +235,7 @@ grub_usb_device_initialize (grub_usb_device_t dev)
void grub_usb_device_attach (grub_usb_device_t dev) void grub_usb_device_attach (grub_usb_device_t dev)
{ {
int i; int i;
/* XXX: Just check configuration 0 for now. */ /* XXX: Just check configuration 0 for now. */
for (i = 0; i < dev->config[0].descconf->numif; i++) for (i = 0; i < dev->config[0].descconf->numif; i++)
{ {
@ -331,7 +331,7 @@ grub_usb_register_attach_hook_class (struct grub_usb_attach_desc *desc)
void void
grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc) grub_usb_unregister_attach_hook_class (struct grub_usb_attach_desc *desc)
{ {
grub_list_remove (GRUB_AS_LIST (desc)); grub_list_remove (GRUB_AS_LIST (desc));
} }

20
grub-core/bus/usb/usbhub.c
View File

@ -115,11 +115,11 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller,
grub_millisleep (2); grub_millisleep (2);
grub_boot_time ("Probing USB device driver"); grub_boot_time ("Probing USB device driver");
grub_usb_device_attach (dev); grub_usb_device_attach (dev);
grub_boot_time ("Attached USB device"); grub_boot_time ("Attached USB device");
return dev; return dev;
} }
@ -130,7 +130,7 @@ grub_usb_add_hub (grub_usb_device_t dev)
struct grub_usb_usb_hubdesc hubdesc; struct grub_usb_usb_hubdesc hubdesc;
grub_usb_err_t err; grub_usb_err_t err;
int i; int i;
err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN err = grub_usb_control_msg (dev, (GRUB_USB_REQTYPE_IN
| GRUB_USB_REQTYPE_CLASS | GRUB_USB_REQTYPE_CLASS
| GRUB_USB_REQTYPE_TARGET_DEV), | GRUB_USB_REQTYPE_TARGET_DEV),
@ -328,7 +328,7 @@ grub_usb_controller_dev_register (grub_usb_controller_dev_t usb)
speed = hub->controller->dev->detect_dev (hub->controller, portno, speed = hub->controller->dev->detect_dev (hub->controller, portno,
&changed); &changed);
if (hub->ports[portno].state == PORT_STATE_NORMAL if (hub->ports[portno].state == PORT_STATE_NORMAL
&& speed != GRUB_USB_SPEED_NONE) && speed != GRUB_USB_SPEED_NONE)
{ {
@ -422,7 +422,7 @@ wait_power_nonroot_hub (grub_usb_device_t dev)
grub_usb_err_t err; grub_usb_err_t err;
int continue_waiting = 0; int continue_waiting = 0;
unsigned i; unsigned i;
for (i = 1; i <= dev->nports; i++) for (i = 1; i <= dev->nports; i++)
if (dev->ports[i - 1].state == PORT_STATE_WAITING_FOR_STABLE_POWER) if (dev->ports[i - 1].state == PORT_STATE_WAITING_FOR_STABLE_POWER)
{ {
@ -564,7 +564,7 @@ poll_nonroot_hub (grub_usb_device_t dev)
detach_device (dev->children[i - 1]); detach_device (dev->children[i - 1]);
dev->children[i - 1] = NULL; dev->children[i - 1] = NULL;
/* Connected and status of connection changed ? */ /* Connected and status of connection changed ? */
if (status & GRUB_USB_HUB_STATUS_PORT_CONNECTED) if (status & GRUB_USB_HUB_STATUS_PORT_CONNECTED)
{ {
@ -642,7 +642,7 @@ poll_nonroot_hub (grub_usb_device_t dev)
split_hubport = dev->split_hubport; split_hubport = dev->split_hubport;
split_hubaddr = dev->split_hubaddr; split_hubaddr = dev->split_hubaddr;
} }
/* Add the device and assign a device address to it. */ /* Add the device and assign a device address to it. */
next_dev = grub_usb_hub_add_dev (&dev->controller, speed, next_dev = grub_usb_hub_add_dev (&dev->controller, speed,
split_hubport, split_hubaddr); split_hubport, split_hubaddr);
@ -707,12 +707,12 @@ grub_usb_poll_devices (int wait_for_completion)
while (1) while (1)
{ {
rescan = 0; rescan = 0;
/* We should check changes of non-root hubs too. */ /* We should check changes of non-root hubs too. */
for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++) for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++)
{ {
grub_usb_device_t dev = grub_usb_devs[i]; grub_usb_device_t dev = grub_usb_devs[i];
if (dev && dev->descdev.class == 0x09) if (dev && dev->descdev.class == 0x09)
poll_nonroot_hub (dev); poll_nonroot_hub (dev);
} }
@ -723,7 +723,7 @@ grub_usb_poll_devices (int wait_for_completion)
for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++) for (i = 0; i < GRUB_USBHUB_MAX_DEVICES; i++)
{ {
grub_usb_device_t dev = grub_usb_devs[i]; grub_usb_device_t dev = grub_usb_devs[i];
if (dev && dev->descdev.class == 0x09) if (dev && dev->descdev.class == 0x09)
continue_waiting = continue_waiting || wait_power_nonroot_hub (dev); continue_waiting = continue_waiting || wait_power_nonroot_hub (dev);
} }

4
grub-core/bus/usb/usbtrans.c
View File

@ -40,7 +40,7 @@ grub_usb_bulk_maxpacket (grub_usb_device_t dev,
static grub_usb_err_t static grub_usb_err_t
grub_usb_execute_and_wait_transfer (grub_usb_device_t dev, grub_usb_execute_and_wait_transfer (grub_usb_device_t dev,
grub_usb_transfer_t transfer, grub_usb_transfer_t transfer,
int timeout, grub_size_t *actual) int timeout, grub_size_t *actual)
{ {
@ -205,7 +205,7 @@ grub_usb_control_msg (grub_usb_device_t dev,
grub_dprintf ("usb", "control: err=%d\n", err); grub_dprintf ("usb", "control: err=%d\n", err);
grub_free (transfer->transactions); grub_free (transfer->transactions);
grub_free (transfer); grub_free (transfer);
grub_dma_free (setupdata_chunk); grub_dma_free (setupdata_chunk);