← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/mst_fpga.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/mst_fpga.c
14
14
/* Mainstone FPGA for extern irqs */
15
15
#define FPGA_GPIO_PIN   0
16
16
#define MST_NUM_IRQS    16
17
 
#define MST_BASE                MST_FPGA_PHYS
18
17
#define MST_LEDDAT1             0x10
19
18
#define MST_LEDDAT2             0x14
20
19
#define MST_LEDCTRL             0x40
29
28
#define MST_PCMCIA1             0xe4
30
29
 
31
30
typedef struct mst_irq_state{
32
 
        target_phys_addr_t target_base;
33
31
        qemu_irq *parent;
34
32
        qemu_irq *pins;
35
33
 
83
81
mst_fpga_readb(void *opaque, target_phys_addr_t addr)
84
82
{
85
83
        mst_irq_state *s = (mst_irq_state *) opaque;
86
 
        addr -= s->target_base;
87
84
 
88
85
        switch (addr) {
89
86
        case MST_LEDDAT1:
121
118
mst_fpga_writeb(void *opaque, target_phys_addr_t addr, uint32_t value)
122
119
{
123
120
        mst_irq_state *s = (mst_irq_state *) opaque;
124
 
        addr -= s->target_base;
125
121
        value &= 0xffffffff;
126
122
 
127
123
        switch (addr) {
168
164
        }
169
165
}
170
166
 
171
 
CPUReadMemoryFunc *mst_fpga_readfn[] = {
 
167
static CPUReadMemoryFunc *mst_fpga_readfn[] = {
172
168
        mst_fpga_readb,
173
169
        mst_fpga_readb,
174
170
        mst_fpga_readb,
175
171
};
176
 
CPUWriteMemoryFunc *mst_fpga_writefn[] = {
 
172
static CPUWriteMemoryFunc *mst_fpga_writefn[] = {
177
173
        mst_fpga_writeb,
178
174
        mst_fpga_writeb,
179
175
        mst_fpga_writeb,
229
225
        s = (mst_irq_state  *)
230
226
                qemu_mallocz(sizeof(mst_irq_state));
231
227
 
232
 
        if (!s)
233
 
                return NULL;
234
 
        s->target_base = base;
235
228
        s->parent = &cpu->pic[irq];
236
229
 
237
230
        /* alloc the external 16 irqs */
240
233
 
241
234
        iomemtype = cpu_register_io_memory(0, mst_fpga_readfn,
242
235
                mst_fpga_writefn, s);
243
 
        cpu_register_physical_memory(MST_BASE, 0x00100000, iomemtype);
 
236
        cpu_register_physical_memory(base, 0x00100000, iomemtype);
244
237
        register_savevm("mainstone_fpga", 0, 0, mst_fpga_save, mst_fpga_load, s);
245
238
        return qi;
246
239
}