← Back to branch summary

~ubuntu-branches/ubuntu/saucy/qemu/saucy-proposed

« back to all changes in this revision

Viewing changes to include/hw/block/flash.h

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-05-28 08:18:30 UTC
  • mfrom: (1.8.2) (10.1.37 sid)
  • Revision ID: package-import@ubuntu.com-20130528081830-87xl2z9fq516a814
Tags: 1.5.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.5.0+dfs-2 from debian unstable.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - Dropped patches:
    * 0001-fix-wrong-output-with-info-chardev-for-tcp-socket.patch
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * gridcentric patch - updated
    * linaro arm patches from qemu-linaro rebasing branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/hw/block/flash.h
 
1
#ifndef HW_FLASH_H
 
2
#define HW_FLASH_H 1
 
3
 
 
4
/* NOR flash devices */
 
5
 
 
6
#include "exec/memory.h"
 
7
 
 
8
typedef struct pflash_t pflash_t;
 
9
 
 
10
/* pflash_cfi01.c */
 
11
pflash_t *pflash_cfi01_register(hwaddr base,
 
12
                                DeviceState *qdev, const char *name,
 
13
                                hwaddr size,
 
14
                                BlockDriverState *bs,
 
15
                                uint32_t sector_len, int nb_blocs, int width,
 
16
                                uint16_t id0, uint16_t id1,
 
17
                                uint16_t id2, uint16_t id3, int be);
 
18
 
 
19
/* pflash_cfi02.c */
 
20
pflash_t *pflash_cfi02_register(hwaddr base,
 
21
                                DeviceState *qdev, const char *name,
 
22
                                hwaddr size,
 
23
                                BlockDriverState *bs, uint32_t sector_len,
 
24
                                int nb_blocs, int nb_mappings, int width,
 
25
                                uint16_t id0, uint16_t id1,
 
26
                                uint16_t id2, uint16_t id3,
 
27
                                uint16_t unlock_addr0, uint16_t unlock_addr1,
 
28
                                int be);
 
29
 
 
30
MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl);
 
31
 
 
32
/* nand.c */
 
33
DeviceState *nand_init(BlockDriverState *bdrv, int manf_id, int chip_id);
 
34
void nand_setpins(DeviceState *dev, uint8_t cle, uint8_t ale,
 
35
                  uint8_t ce, uint8_t wp, uint8_t gnd);
 
36
void nand_getpins(DeviceState *dev, int *rb);
 
37
void nand_setio(DeviceState *dev, uint32_t value);
 
38
uint32_t nand_getio(DeviceState *dev);
 
39
uint32_t nand_getbuswidth(DeviceState *dev);
 
40
 
 
41
#define NAND_MFR_TOSHIBA        0x98
 
42
#define NAND_MFR_SAMSUNG        0xec
 
43
#define NAND_MFR_FUJITSU        0x04
 
44
#define NAND_MFR_NATIONAL       0x8f
 
45
#define NAND_MFR_RENESAS        0x07
 
46
#define NAND_MFR_STMICRO        0x20
 
47
#define NAND_MFR_HYNIX          0xad
 
48
#define NAND_MFR_MICRON         0x2c
 
49
 
 
50
/* onenand.c */
 
51
void *onenand_raw_otp(DeviceState *onenand_device);
 
52
 
 
53
/* ecc.c */
 
54
typedef struct {
 
55
    uint8_t cp;         /* Column parity */
 
56
    uint16_t lp[2];     /* Line parity */
 
57
    uint16_t count;
 
58
} ECCState;
 
59
 
 
60
uint8_t ecc_digest(ECCState *s, uint8_t sample);
 
61
void ecc_reset(ECCState *s);
 
62
extern VMStateDescription vmstate_ecc_state;
 
63
 
 
64
#endif