← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/hw/arm/pxa.h

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-02-25 22:31:43 UTC
  • mfrom: (1.8.5)
  • Revision ID: package-import@ubuntu.com-20140225223143-odhqxfc60wxrjl15
Tags: 2.0.0~rc1+dfsg-0ubuntu1
https://launchpad.net/bugs/1294823
https://launchpad.net/bugs/1295072
* Merge 2.0.0-rc1
* debian/rules: consolidate ppc filter entries.
* Move qemu-system-arch64 into qemu-system-arm
* debian/patches/define-trusty-machine-type.patch: define a trusty machine
  type, currently the same as pc-i440fx-2.0, to put is in a better position
  to enable live migrations from trusty onward.  (LP: #1294823)
* debian/control: build-dep on libfdt >= 1.4.0  (LP: #1295072)
* Merge latest upstream git to commit dc9528f
* Debian/rules:
  - remove -enable-uname-release=2.6.32
  - don't make the aarch64 target Ubuntu-specific.
* Remove patches which are now upstream:
  - fix-smb-security-share.patch
  - slirp-smb-redirect-port-445-too.patch 
  - linux-user-Implement-sendmmsg-syscall.patch (better version is upstream)
  - signal-added-a-wrapper-for-sigprocmask-function.patch
  - ubuntu/signal-sigsegv-protection-on-do_sigprocmask.patch
  - ubuntu/Don-t-block-SIGSEGV-at-more-places.patch
  - ubuntu/ppc-force-cpu-threads-count-to-be-power-of-2.patch
* add link for /usr/share/qemu/bios-256k.bin
* Remove all linaro patches.
* Remove all arm64/ patches.  Many but not all are upstream.
* Remove CVE-2013-4377.patch which is upstream.
* debian/control-in: don't make qemu-system-aarch64 ubuntu-specific

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/hw/arm/pxa.h
102
102
 
103
103
/* pxa2xx_keypad.c */
104
104
struct  keymap {
105
 
    int column;
106
 
    int row;
 
105
    int8_t column;
 
106
    int8_t row;
107
107
};
108
108
typedef struct PXA2xxKeyPadState PXA2xxKeyPadState;
109
109
PXA2xxKeyPadState *pxa27x_keypad_init(MemoryRegion *sysmem,
110
110
                                      hwaddr base,
111
111
                                      qemu_irq irq);
112
 
void pxa27x_register_keypad(PXA2xxKeyPadState *kp, struct keymap *map,
113
 
                int size);
 
112
void pxa27x_register_keypad(PXA2xxKeyPadState *kp,
 
113
                            const struct keymap *map, int size);
114
114
 
115
115
/* pxa2xx.c */
116
116
typedef struct PXA2xxI2CState PXA2xxI2CState;
117
117
PXA2xxI2CState *pxa2xx_i2c_init(hwaddr base,
118
118
                qemu_irq irq, uint32_t page_size);
119
 
i2c_bus *pxa2xx_i2c_bus(PXA2xxI2CState *s);
 
119
I2CBus *pxa2xx_i2c_bus(PXA2xxI2CState *s);
120
120
 
121
121
typedef struct PXA2xxI2SState PXA2xxI2SState;
122
122
typedef struct PXA2xxFIrState PXA2xxFIrState;