← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to hw/pl181.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-22 10:13:17 UTC
  • mfrom: (1.2.1 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090322101317-iigjtnu5qil35dtb
Tags: 0.10.1-1
http://bugs.debian.org/501400
[ Aurelien Jarno ]
* New upstream stable release:
  - patches/80_stable-branch.patch: remove.
* debian/control: 
  - Remove depends on proll.
  - Move depends on device-tree-compiler to build-depends.
  - Bump Standards-Version to 3.8.1 (no changes).
* patches/82_qemu-img_decimal.patch: new patch from upstream to make
  qemu-img accept sizes with decimal values (closes: bug#501400).

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/pl181.c
24
24
 
25
25
typedef struct {
26
26
    SDState *card;
27
 
    uint32_t base;
28
27
    uint32_t clock;
29
28
    uint32_t power;
30
29
    uint32_t cmdarg;
261
260
    pl181_state *s = (pl181_state *)opaque;
262
261
    uint32_t tmp;
263
262
 
264
 
    offset -= s->base;
265
263
    if (offset >= 0xfe0 && offset < 0x1000) {
266
264
        return pl181_id[(offset - 0xfe0) >> 2];
267
265
    }
344
342
{
345
343
    pl181_state *s = (pl181_state *)opaque;
346
344
 
347
 
    offset -= s->base;
348
345
    switch (offset) {
349
346
    case 0x00: /* Power */
350
347
        s->power = value & 0xff;
457
454
    iomemtype = cpu_register_io_memory(0, pl181_readfn,
458
455
                                       pl181_writefn, s);
459
456
    cpu_register_physical_memory(base, 0x00001000, iomemtype);
460
 
    s->base = base;
461
457
    s->card = sd_init(bd, 0);
462
458
    s->irq[0] = irq0;
463
459
    s->irq[1] = irq1;