Revision 22ed1d34

b/arm-dis.c
2515 2515
			  {
2516 2516
			    func (stream, "<illegal constant %.8x:%x:%x>",
2517 2517
                                  bits, cmode, op);
2518
                            size = 32;
2519 2518
			    break;
2520 2519
			  }
2521 2520
                        switch (size)
b/hw/omap1.c
2348 2348
        return;
2349 2349

  
2350 2350
    case 0x0c:	/* ARM_EWUPCT */
2351
        diff = s->clkm.arm_ewupct ^ value;
2352 2351
        s->clkm.arm_ewupct = value & 0x003f;
2353 2352
        return;
2354 2353

  
b/hw/omap2.c
1968 1968

  
1969 1969
    s->irq = irq;
1970 1970
    s->codec.rxdrq = *drq ++;
1971
    s->codec.txdrq = *drq ++;
1971
    s->codec.txdrq = *drq;
1972 1972
    omap_eac_reset(s);
1973 1973

  
1974 1974
#ifdef HAS_AUDIO
b/hw/omap_sx1.c
126 126
    static uint32_t cs1val = 0x00215070;
127 127
    static uint32_t cs2val = 0x00001139;
128 128
    static uint32_t cs3val = 0x00001139;
129
    ram_addr_t phys_flash;
130 129
    DriveInfo *dinfo;
131 130
    int fl_idx;
132 131
    uint32_t flash_size = flash0_size;
......
140 139

  
141 140
    /* External Flash (EMIFS) */
142 141
    cpu_register_physical_memory(OMAP_CS0_BASE, flash_size,
143
                    (phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM);
142
                                 qemu_ram_alloc(flash_size) | IO_MEM_ROM);
144 143

  
145 144
    io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val);
146 145
    cpu_register_physical_memory(OMAP_CS0_BASE + flash_size,
......
171 170
    if ((version == 1) &&
172 171
            (dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
173 172
        cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size,
174
                        (phys_flash = qemu_ram_alloc(flash1_size)) |
175
                        IO_MEM_ROM);
173
                                     qemu_ram_alloc(flash1_size) | IO_MEM_ROM);
176 174
        io = cpu_register_io_memory(static_readfn, static_writefn, &cs1val);
177 175
        cpu_register_physical_memory(OMAP_CS1_BASE + flash1_size,
178 176
                        OMAP_CS1_SIZE - flash1_size, io);
b/hw/palm.c
206 206
    static uint32_t cs1val = 0x0000e1a0;
207 207
    static uint32_t cs2val = 0x0000e1a0;
208 208
    static uint32_t cs3val = 0xe1a0e1a0;
209
    ram_addr_t phys_flash;
210 209
    int rom_size, rom_loaded = 0;
211 210
    DisplayState *ds = get_displaystate();
212 211

  
......
214 213

  
215 214
    /* External Flash (EMIFS) */
216 215
    cpu_register_physical_memory(OMAP_CS0_BASE, flash_size,
217
                    (phys_flash = qemu_ram_alloc(flash_size)) | IO_MEM_ROM);
216
                    qemu_ram_alloc(flash_size) | IO_MEM_ROM);
218 217

  
219 218
    io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val);
220 219
    cpu_register_physical_memory(OMAP_CS0_BASE + flash_size,
b/hw/pflash_cfi01.c
542 542
    }
543 543
    if (!(n & 0x1)) {
544 544
        ret++;
545
#if 0 /* This is not necessary as n is never 0 */
545 546
        n = n >> 1;
547
#endif
546 548
    }
547 549
#if 0 /* This is not necessary as n is never 0 */
548 550
    if (!n)
b/hw/pflash_cfi02.c
582 582
    }
583 583
    if (!(n & 0x1)) {
584 584
        ret++;
585
#if 0 /* This is not necessary as n is never 0 */
585 586
        n = n >> 1;
587
#endif
586 588
    }
587 589
#if 0 /* This is not necessary as n is never 0 */
588 590
    if (!n)
b/hw/sd.c
1143 1143
}
1144 1144

  
1145 1145
static sd_rsp_type_t sd_app_command(SDState *sd,
1146
                                    SDRequest req) {
1147
    uint32_t rca;
1148

  
1149
    if (sd_cmd_type[req.cmd] == sd_ac || sd_cmd_type[req.cmd] == sd_adtc)
1150
        rca = req.arg >> 16;
1151

  
1146
                                    SDRequest req)
1147
{
1152 1148
    DPRINTF("ACMD%d 0x%08x\n", req.cmd, req.arg);
1153 1149
    switch (req.cmd) {
1154 1150
    case 6:	/* ACMD6:  SET_BUS_WIDTH */
b/hw/smc91c111.c
160 160
    int i;
161 161
    int len;
162 162
    int control;
163
    int add_crc;
164 163
    int packetnum;
165 164
    uint8_t *p;
166 165

  
......
187 186
            len = 64;
188 187
        }
189 188
#if 0
190
        /* The card is supposed to append the CRC to the frame.  However
191
           none of the other network traffic has the CRC appended.
192
           Suspect this is low level ethernet detail we don't need to worry
193
           about.  */
194
        add_crc = (control & 0x10) || (s->tcr & TCR_NOCRC) == 0;
195
        if (add_crc) {
196
            uint32_t crc;
197

  
198
            crc = crc32(~0, p, len);
199
            memcpy(p + len, &crc, 4);
200
            len += 4;
189
        {
190
            int add_crc;
191

  
192
            /* The card is supposed to append the CRC to the frame.
193
               However none of the other network traffic has the CRC
194
               appended.  Suspect this is low level ethernet detail we
195
               don't need to worry about.  */
196
            add_crc = (control & 0x10) || (s->tcr & TCR_NOCRC) == 0;
197
            if (add_crc) {
198
                uint32_t crc;
199

  
200
                crc = crc32(~0, p, len);
201
                memcpy(p + len, &crc, 4);
202
                len += 4;
203
            }
201 204
        }
202
#else
203
        add_crc = 0;
204 205
#endif
205 206
        if (s->ctr & CTR_AUTO_RELEASE)
206 207
            /* Race?  */
......
670 671
        *(p++) = crc & 0xff; crc >>= 8;
671 672
        *(p++) = crc & 0xff; crc >>= 8;
672 673
        *(p++) = crc & 0xff; crc >>= 8;
673
        *(p++) = crc & 0xff; crc >>= 8;
674
        *(p++) = crc & 0xff;
674 675
    }
675 676
    if (size & 1) {
676 677
        *(p++) = buf[size - 1];
677
        *(p++) = 0x60;
678
        *p = 0x60;
678 679
    } else {
679 680
        *(p++) = 0;
680
        *(p++) = 0x40;
681
        *p = 0x40;
681 682
    }
682 683
    /* TODO: Raise early RX interrupt?  */
683 684
    s->int_level |= INT_RCV;
b/hw/spitz.c
721 721
    mux = ssi_create_slave(cpu->ssp[CORGI_SSP_PORT - 1], "corgi-ssp");
722 722

  
723 723
    bus = qdev_get_child_bus(mux, "ssi0");
724
    dev = ssi_create_slave(bus, "spitz-lcdtg");
724
    ssi_create_slave(bus, "spitz-lcdtg");
725 725

  
726 726
    bus = qdev_get_child_bus(mux, "ssi1");
727 727
    dev = ssi_create_slave(bus, "ads7846");
b/hw/stellaris.c
1367 1367
            gpio_out[GPIO_D][0] = qdev_get_gpio_in(mux, 0);
1368 1368

  
1369 1369
            bus = qdev_get_child_bus(mux, "ssi0");
1370
            dev = ssi_create_slave(bus, "ssi-sd");
1370
            ssi_create_slave(bus, "ssi-sd");
1371 1371

  
1372 1372
            bus = qdev_get_child_bus(mux, "ssi1");
1373 1373
            dev = ssi_create_slave(bus, "ssd0323");
b/hw/tusb6010.c
425 425
        return s->rx_config[epnum];
426 426
    case TUSB_EP_MAX_PACKET_SIZE_OFFSET ...
427 427
            (TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b):
428
        epnum = (offset - TUSB_EP_MAX_PACKET_SIZE_OFFSET) >> 2;
429 428
        return 0x00000000;	/* TODO */
430 429
    case TUSB_WAIT_COUNT:
431 430
        return 0x00;		/* TODO */
......
630 629
        break;
631 630
    case TUSB_EP_MAX_PACKET_SIZE_OFFSET ...
632 631
            (TUSB_EP_MAX_PACKET_SIZE_OFFSET + 0x3b):
633
        epnum = (offset - TUSB_EP_MAX_PACKET_SIZE_OFFSET) >> 2;
634 632
        return;		/* TODO */
635 633
    case TUSB_WAIT_COUNT:
636 634
        return;		/* TODO */
b/hw/wm8750.c
62 62

  
63 63
static inline void wm8750_in_load(WM8750State *s)
64 64
{
65
    int acquired;
66 65
    if (s->idx_in + s->req_in <= sizeof(s->data_in))
67 66
        return;
68 67
    s->idx_in = audio_MAX(0, (int) sizeof(s->data_in) - s->req_in);
69
    acquired = AUD_read(*s->in[0], s->data_in + s->idx_in,
70
                    sizeof(s->data_in) - s->idx_in);
68
    AUD_read(*s->in[0], s->data_in + s->idx_in,
69
             sizeof(s->data_in) - s->idx_in);
71 70
}
72 71

  
73 72
static inline void wm8750_out_flush(WM8750State *s)
b/target-arm/translate.c
5242 5242
            if (!u) {
5243 5243
                /* Extract.  */
5244 5244
                imm = (insn >> 8) & 0xf;
5245
                count = q + 1;
5246 5245

  
5247 5246
                if (imm > 7 && !q)
5248 5247
                    return 1;

Also available in: Unified diff