ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: Remove leading underscores from __musb_irq_max 

Identifiers with double leading underscore are reserved, so rename
__musb_irq_max so we don't encroach on reserved namespace.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Peter Maydell 2011-08-31 21:49:39 +01:00 committed by Gerd Hoffmann
parent d679157868
commit 9147b75288
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/tusb6010.c
View File

@ -785,9 +785,9 @@ static int tusb6010_init(SysBusDevice *dev)
sysbus_init_mmio_region(dev, &s->iomem[0]); sysbus_init_mmio_region(dev, &s->iomem[0]);
sysbus_init_mmio_region(dev, &s->iomem[1]); sysbus_init_mmio_region(dev, &s->iomem[1]);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
qdev_init_gpio_in(&dev->qdev, tusb6010_irq, __musb_irq_max + 1); qdev_init_gpio_in(&dev->qdev, tusb6010_irq, musb_irq_max + 1);
musb_irqs = g_new0(qemu_irq, __musb_irq_max); musb_irqs = g_new0(qemu_irq, musb_irq_max);
for (i = 0; i < __musb_irq_max; i++) { for (i = 0; i < musb_irq_max; i++) {
musb_irqs[i] = qdev_get_gpio_in(&dev->qdev, i + 1); musb_irqs[i] = qdev_get_gpio_in(&dev->qdev, i + 1);
} }
s->musb = musb_init(musb_irqs); s->musb = musb_init(musb_irqs);

3
hw/usb.h
View File

@ -338,7 +338,8 @@ enum musb_irq_source_e {
musb_irq_tx, musb_irq_tx,
musb_set_vbus, musb_set_vbus,
musb_set_session, musb_set_session,
__musb_irq_max, /* Add new interrupts here */
musb_irq_max, /* total number of interrupts defined */
}; };
typedef struct MUSBState MUSBState; typedef struct MUSBState MUSBState;