← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu-linaro/vivid

« back to all changes in this revision

Viewing changes to hw/pxa2xx_lcd.c

  • Committer: Ricardo Salveti de Araujo
  • Date: 2012-09-20 18:39:31 UTC
  • mfrom: (12922.1.2 qemu-linaro)
  • Revision ID: ricardo.salveti@linaro.org-20120920183931-sp3cg6kpdl8dmwo9
* New upstream release.
  - support emulated systems with more than 2G of memory. (LP: #1030588)
* Drop powerpc-missing-include.patch - merged upstream.
* Update debian/control:
  - drop perl build dependency.
  - add libfdt-dev build dependency.
* Update debian/qemu-keymaps.install file.
* Update debian/rules:
  - update QEMU_CPU for ARM architecture: armv4l -> armv7l.
  - update conf_audio_drv: default to PulseAudio since PA is the default on
    Ubuntu.
  - enable KVM on ARM architecture.
  - enable flat device tree support (--enable-fdt). (LP: #1030594)

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/pxa2xx_lcd.c
19
19
#include "framebuffer.h"
20
20
 
21
21
struct DMAChannel {
22
 
    target_phys_addr_t branch;
 
22
    uint32_t branch;
23
23
    uint8_t up;
24
24
    uint8_t palette[1024];
25
25
    uint8_t pbuffer[1024];
26
26
    void (*redraw)(PXA2xxLCDState *s, target_phys_addr_t addr,
27
27
                   int *miny, int *maxy);
28
28
 
29
 
    target_phys_addr_t descriptor;
30
 
    target_phys_addr_t source;
 
29
    uint32_t descriptor;
 
30
    uint32_t source;
31
31
    uint32_t id;
32
32
    uint32_t command;
33
33
};
929
929
    .minimum_version_id = 0,
930
930
    .minimum_version_id_old = 0,
931
931
    .fields      = (VMStateField[]) {
932
 
        VMSTATE_UINTTL(branch, struct DMAChannel),
 
932
        VMSTATE_UINT32(branch, struct DMAChannel),
933
933
        VMSTATE_UINT8(up, struct DMAChannel),
934
934
        VMSTATE_BUFFER(pbuffer, struct DMAChannel),
935
 
        VMSTATE_UINTTL(descriptor, struct DMAChannel),
936
 
        VMSTATE_UINTTL(source, struct DMAChannel),
 
935
        VMSTATE_UINT32(descriptor, struct DMAChannel),
 
936
        VMSTATE_UINT32(source, struct DMAChannel),
937
937
        VMSTATE_UINT32(id, struct DMAChannel),
938
938
        VMSTATE_UINT32(command, struct DMAChannel),
939
939
        VMSTATE_END_OF_LIST()