Fix Sparse warnings about using plain integer as NULL pointer
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
diff --git a/hw/nseries.c b/hw/nseries.c
index 066a0f9..79f7387 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -248,7 +248,7 @@
/* XXX: are the three pins inverted inside the chip between the
* tsc and the cpu (N4111)? */
- qemu_irq penirq = 0; /* NC */
+ qemu_irq penirq = NULL; /* NC */
qemu_irq kbirq = omap2_gpio_in_get(s->cpu->gpif, N800_TSC_KP_IRQ_GPIO)[0];
qemu_irq dav = omap2_gpio_in_get(s->cpu->gpif, N800_TSC_TS_GPIO)[0];
@@ -716,7 +716,7 @@
static void n8x0_dss_setup(struct n800_s *s)
{
- s->blizzard.opaque = s1d13745_init(0);
+ s->blizzard.opaque = s1d13745_init(NULL);
s->blizzard.block = s1d13745_write_block;
s->blizzard.write = s1d13745_write;
s->blizzard.read = s1d13745_read;
@@ -769,9 +769,9 @@
/* Using the NOR interface */
omap_gpmc_attach(s->cpu->gpmc, N8X0_USB_ASYNC_CS,
- tusb6010_async_io(tusb), 0, 0, tusb);
+ tusb6010_async_io(tusb), NULL, NULL, tusb);
omap_gpmc_attach(s->cpu->gpmc, N8X0_USB_SYNC_CS,
- tusb6010_sync_io(tusb), 0, 0, tusb);
+ tusb6010_sync_io(tusb), NULL, NULL, tusb);
s->usb = tusb;
omap2_gpio_out_set(s->cpu->gpif, N8X0_TUSB_ENABLE_GPIO, tusb_pwr);
@@ -1047,7 +1047,7 @@
"headphone", N8X0_HEADPHONE_GPIO,
OMAP_GPIOSW_TYPE_CONNECTION | OMAP_GPIOSW_INVERTED,
},
- { 0 }
+ { NULL }
}, n810_gpiosw_info[] = {
{
"gps_reset", N810_GPS_RESET_GPIO,
@@ -1068,7 +1068,7 @@
"slide", N810_SLIDE_GPIO,
OMAP_GPIOSW_TYPE_COVER | OMAP_GPIOSW_INVERTED,
},
- { 0 }
+ { NULL }
};
static struct omap_partition_info_s {
@@ -1083,7 +1083,7 @@
{ 0x00280000, 0x00200000, 0x3, "initfs" },
{ 0x00480000, 0x0fb80000, 0x3, "rootfs" },
- { 0, 0, 0, 0 }
+ { 0, 0, 0, NULL }
}, n810_part_info[] = {
{ 0x00000000, 0x00020000, 0x3, "bootloader" },
{ 0x00020000, 0x00060000, 0x0, "config" },
@@ -1091,7 +1091,7 @@
{ 0x002a0000, 0x00400000, 0x0, "initfs" },
{ 0x006a0000, 0x0f960000, 0x0, "rootfs" },
- { 0, 0, 0, 0 }
+ { 0, 0, 0, NULL }
};
static bdaddr_t n8x0_bd_addr = {{ N8X0_BD_ADDR }};
diff --git a/hw/omap1.c b/hw/omap1.c
index 06c7158..e9676ec 100644
--- a/hw/omap1.c
+++ b/hw/omap1.c
@@ -436,7 +436,7 @@
struct omap_intr_handler_s *s = (struct omap_intr_handler_s *) opaque;
int offset = addr;
int bank_no, line_no;
- struct omap_intr_handler_bank_s *bank = 0;
+ struct omap_intr_handler_bank_s *bank = NULL;
if ((offset & 0xf80) == 0x80) {
bank_no = (offset & 0x60) >> 5;
@@ -514,7 +514,7 @@
struct omap_intr_handler_s *s = (struct omap_intr_handler_s *) opaque;
int offset = addr;
int bank_no, line_no;
- struct omap_intr_handler_bank_s *bank = 0;
+ struct omap_intr_handler_bank_s *bank = NULL;
if ((offset & 0xf80) == 0x80) {
bank_no = (offset & 0x60) >> 5;
@@ -4731,12 +4731,12 @@
omap_findclk(s, "uart2_ck"),
omap_findclk(s, "uart2_ck"),
s->drq[OMAP_DMA_UART2_TX], s->drq[OMAP_DMA_UART2_RX],
- serial_hds[0] ? serial_hds[1] : 0);
+ serial_hds[0] ? serial_hds[1] : NULL);
s->uart[2] = omap_uart_init(0xfffb9800, s->irq[0][OMAP_INT_UART3],
omap_findclk(s, "uart3_ck"),
omap_findclk(s, "uart3_ck"),
s->drq[OMAP_DMA_UART3_TX], s->drq[OMAP_DMA_UART3_RX],
- serial_hds[0] && serial_hds[1] ? serial_hds[2] : 0);
+ serial_hds[0] && serial_hds[1] ? serial_hds[2] : NULL);
omap_dpll_init(&s->dpll[0], 0xfffecf00, omap_findclk(s, "dpll1"));
omap_dpll_init(&s->dpll[1], 0xfffed000, omap_findclk(s, "dpll2"));
diff --git a/hw/omap2.c b/hw/omap2.c
index ef338a5..a845265 100644
--- a/hw/omap2.c
+++ b/hw/omap2.c
@@ -1055,7 +1055,7 @@
s->modules = modules;
for (i = 0; i < modules; i ++)
omap_gpio_module_init(s->module + i, ta, region[i],
- irq[i], 0, 0, fclk[i], iclk);
+ irq[i], NULL, NULL, fclk[i], iclk);
omap_gpif_reset(s);
@@ -1615,13 +1615,13 @@
if (s->codec.in_voice) {
AUD_set_active_in(s->codec.in_voice, 0);
AUD_close_in(&s->codec.card, s->codec.in_voice);
- s->codec.in_voice = 0;
+ s->codec.in_voice = NULL;
}
if (s->codec.out_voice) {
omap_eac_out_empty(s);
AUD_set_active_out(s->codec.out_voice, 0);
AUD_close_out(&s->codec.card, s->codec.out_voice);
- s->codec.out_voice = 0;
+ s->codec.out_voice = NULL;
s->codec.txavail = 0;
}
/* Discard what couldn't be written */
@@ -2555,8 +2555,8 @@
struct omap_target_agent_s *omap_l4ta_get(struct omap_l4_s *bus, int cs)
{
int i, iomemtype;
- struct omap_target_agent_s *ta = 0;
- struct omap_l4_agent_info_s *info = 0;
+ struct omap_target_agent_s *ta = NULL;
+ struct omap_l4_agent_info_s *info = NULL;
for (i = 0; i < bus->ta_num; i ++)
if (omap_l4_agent_info[i].ta == cs) {
@@ -4559,14 +4559,14 @@
omap_findclk(s, "uart2_iclk"),
s->drq[OMAP24XX_DMA_UART2_TX],
s->drq[OMAP24XX_DMA_UART2_RX],
- serial_hds[0] ? serial_hds[1] : 0);
+ serial_hds[0] ? serial_hds[1] : NULL);
s->uart[2] = omap2_uart_init(omap_l4ta(s->l4, 21),
s->irq[0][OMAP_INT_24XX_UART3_IRQ],
omap_findclk(s, "uart3_fclk"),
omap_findclk(s, "uart3_iclk"),
s->drq[OMAP24XX_DMA_UART3_TX],
s->drq[OMAP24XX_DMA_UART3_RX],
- serial_hds[0] && serial_hds[1] ? serial_hds[2] : 0);
+ serial_hds[0] && serial_hds[1] ? serial_hds[2] : NULL);
s->gptimer[0] = omap_gp_timer_init(omap_l4ta(s->l4, 7),
s->irq[0][OMAP_INT_24XX_GPTIMER1],
@@ -4677,7 +4677,7 @@
omap_sti_init(omap_l4ta(s->l4, 18), 0x54000000,
s->irq[0][OMAP_INT_24XX_STI], omap_findclk(s, "emul_ck"),
serial_hds[0] && serial_hds[1] && serial_hds[2] ?
- serial_hds[3] : 0);
+ serial_hds[3] : NULL);
s->eac = omap_eac_init(omap_l4ta(s->l4, 32),
s->irq[0][OMAP_INT_24XX_EAC_IRQ],
diff --git a/hw/omap_clk.c b/hw/omap_clk.c
index a2da17f..6bcabef 100644
--- a/hw/omap_clk.c
+++ b/hw/omap_clk.c
@@ -1086,7 +1086,7 @@
&dss_l4_iclk,
&omapctrl_clk,
- 0
+ NULL
};
void omap_clk_adduser(struct clk *clk, qemu_irq user)
@@ -1184,7 +1184,7 @@
omap_clk_update(clk);
omap_clk_rate_update(clk);
} else
- clk->sibling = 0;
+ clk->sibling = NULL;
}
void omap_clk_onoff(struct clk *clk, int on)
diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c
index c065193..6affef6 100644
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -80,31 +80,31 @@
#include "omap_lcd_template.h"
static draw_line_func draw_line_table2[33] = {
- [0 ... 32] = 0,
+ [0 ... 32] = NULL,
[8] = draw_line2_8,
[15] = draw_line2_15,
[16] = draw_line2_16,
[32] = draw_line2_32,
}, draw_line_table4[33] = {
- [0 ... 32] = 0,
+ [0 ... 32] = NULL,
[8] = draw_line4_8,
[15] = draw_line4_15,
[16] = draw_line4_16,
[32] = draw_line4_32,
}, draw_line_table8[33] = {
- [0 ... 32] = 0,
+ [0 ... 32] = NULL,
[8] = draw_line8_8,
[15] = draw_line8_15,
[16] = draw_line8_16,
[32] = draw_line8_32,
}, draw_line_table12[33] = {
- [0 ... 32] = 0,
+ [0 ... 32] = NULL,
[8] = draw_line12_8,
[15] = draw_line12_15,
[16] = draw_line12_16,
[32] = draw_line12_32,
}, draw_line_table16[33] = {
- [0 ... 32] = 0,
+ [0 ... 32] = NULL,
[8] = draw_line16_8,
[15] = draw_line16_15,
[16] = draw_line16_16,
diff --git a/hw/omap_mmc.c b/hw/omap_mmc.c
index bbe3f28..15cbf06 100644
--- a/hw/omap_mmc.c
+++ b/hw/omap_mmc.c
@@ -619,7 +619,7 @@
s->card = sd_init(bd, 0);
s->cdet = qemu_allocate_irqs(omap_mmc_cover_cb, s, 1)[0];
- sd_set_cb(s->card, 0, s->cdet);
+ sd_set_cb(s->card, NULL, s->cdet);
return s;
}
diff --git a/hw/onenand.c b/hw/onenand.c
index 59bc8ac..c1e7e4d 100644
--- a/hw/onenand.c
+++ b/hw/onenand.c
@@ -426,7 +426,7 @@
case 0x65: /* OTP Access */
s->intstatus |= ONEN_INT;
- s->bdrv_cur = 0;
+ s->bdrv_cur = NULL;
s->current = s->otp;
s->secs_cur = 1 << (BLOCK_SHIFT - 9);
s->addr[ONEN_BUF_BLOCK] = 0;
@@ -624,7 +624,7 @@
s->shift = regshift;
s->intr = irq;
- s->rdy = 0;
+ s->rdy = NULL;
s->id = id;
s->blocks = size >> BLOCK_SHIFT;
s->secs = size >> 9;
diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index 0bf03de..930299a 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -667,7 +667,7 @@
target_phys_addr_t addr, int *miny, int *maxy)
{
int src_width, dest_width;
- drawfn fn = 0;
+ drawfn fn = NULL;
if (s->dest_width)
fn = s->line_fn[s->transp][s->bpp];
if (!fn)
@@ -694,7 +694,7 @@
target_phys_addr_t addr, int *miny, int *maxy)
{
int src_width, dest_width;
- drawfn fn = 0;
+ drawfn fn = NULL;
if (s->dest_width)
fn = s->line_fn[s->transp][s->bpp];
if (!fn)
diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c
index 5b42147..be1309f 100644
--- a/hw/pxa2xx_pcmcia.c
+++ b/hw/pxa2xx_pcmcia.c
@@ -193,8 +193,8 @@
return -ENOENT;
s->card->detach(s->card->state);
- s->card->slot = 0;
- s->card = 0;
+ s->card->slot = NULL;
+ s->card = NULL;
s->slot.attached = 0;
diff --git a/hw/pxa2xx_template.h b/hw/pxa2xx_template.h
index 40f4e4d..1cbe36c 100644
--- a/hw/pxa2xx_template.h
+++ b/hw/pxa2xx_template.h
@@ -403,7 +403,7 @@
/* Overlay planes disabled, no transparency */
static drawfn glue(pxa2xx_draw_fn_, BITS)[16] =
{
- [0 ... 0xf] = 0,
+ [0 ... 0xf] = NULL,
[pxa_lcdc_2bpp] = glue(pxa2xx_draw_line2_, BITS),
[pxa_lcdc_4bpp] = glue(pxa2xx_draw_line4_, BITS),
[pxa_lcdc_8bpp] = glue(pxa2xx_draw_line8_, BITS),
@@ -416,7 +416,7 @@
/* Overlay planes enabled, transparency used */
static drawfn glue(glue(pxa2xx_draw_fn_, BITS), t)[16] =
{
- [0 ... 0xf] = 0,
+ [0 ... 0xf] = NULL,
[pxa_lcdc_4bpp] = glue(pxa2xx_draw_line4_, BITS),
[pxa_lcdc_8bpp] = glue(pxa2xx_draw_line8_, BITS),
[pxa_lcdc_16bpp] = glue(pxa2xx_draw_line16t_, BITS),
diff --git a/hw/pxa2xx_timer.c b/hw/pxa2xx_timer.c
index 43bad2c..d992cc3 100644
--- a/hw/pxa2xx_timer.c
+++ b/hw/pxa2xx_timer.c
@@ -465,7 +465,7 @@
{
pxa2xx_timer_info *s = pxa2xx_timer_init(base, irqs);
s->freq = PXA25X_FREQ;
- s->tm4 = 0;
+ s->tm4 = NULL;
}
void pxa27x_timer_init(target_phys_addr_t base,
diff --git a/hw/sh7750_regnames.c b/hw/sh7750_regnames.c
index d4b519d..5a5a2d8 100644
--- a/hw/sh7750_regnames.c
+++ b/hw/sh7750_regnames.c
@@ -81,7 +81,7 @@
REGNAME(SH7750_BCR3_A7)
REGNAME(SH7750_BCR4_A7)
REGNAME(SH7750_SDMR2_A7)
- REGNAME(SH7750_SDMR3_A7) {(uint32_t) - 1, 0}
+ REGNAME(SH7750_SDMR3_A7) {(uint32_t) - 1, NULL}
};
const char *regname(uint32_t addr)
diff --git a/hw/sm501.c b/hw/sm501.c
index fc34a99..612a8e5 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -1096,7 +1096,7 @@
/* bridge to serial emulation module */
if (chr)
serial_mm_init(base + MMIO_BASE_OFFSET + SM501_UART0, 2,
- 0, /* TODO : chain irq to IRL */
+ NULL, /* TODO : chain irq to IRL */
115200, chr, 1);
/* create qemu graphic console */
diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 6bbe24d..e851ca1 100644
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -331,7 +331,7 @@
s->codec.out.size = 0;
AUD_set_active_out(s->dac_voice[0], 0);
AUD_close_out(&s->card, s->dac_voice[0]);
- s->dac_voice[0] = 0;
+ s->dac_voice[0] = NULL;
}
s->codec.cts = 0;
diff --git a/linux-user/arm/nwfpe/fpa11.c b/linux-user/arm/nwfpe/fpa11.c
index 67e65e5..3ff80eb 100644
--- a/linux-user/arm/nwfpe/fpa11.c
+++ b/linux-user/arm/nwfpe/fpa11.c
@@ -30,7 +30,7 @@
#include <stdio.h>
-FPA11* qemufpa=0;
+FPA11* qemufpa = NULL;
CPUARMState* user_registers;
/* Reset the FPA11 chip. Called to initialize and reset the emulator. */
diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c
index 6dc8503..529df0c 100644
--- a/target-sh4/op_helper.c
+++ b/target-sh4/op_helper.c
@@ -145,7 +145,7 @@
memory_content *next = current->next;
free (current);
env->movcal_backup = current = next;
- if (current == 0)
+ if (current == NULL)
env->movcal_backup_tail = &(env->movcal_backup);
}
}
@@ -161,7 +161,7 @@
memory_content *next = (*current)->next;
stl(a, (*current)->value);
- if (next == 0)
+ if (next == NULL)
{
env->movcal_backup_tail = current;
}
