haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Handle MMC card insertion/removal/readonly signals.

Browse source 
Hook them up to Palm T|E GPIOs.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3471 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2007-10-28 19:24:52 +00:00
parent 38a34e1d7a
commit 8e129e0748
4 changed files with 57 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/omap.c
View file

@ -2882,7 +2882,9 @@ static uint32_t omap_mpuio_read(void *opaque, target_phys_addr_t addr)
case 0x24: /* GPIO_INT */
ret = s->ints;
s->ints &= ~s->mask;
s->ints &= s->mask;
if (ret)
qemu_irq_lower(s->irq);
return ret;
case 0x28: /* KBD_MASKIT */

1
hw/omap.h
View file

@ -470,6 +470,7 @@ struct omap_mmc_s;
struct omap_mmc_s *omap_mmc_init(target_phys_addr_t base,
qemu_irq irq, qemu_irq dma[], omap_clk clk);
void omap_mmc_reset(struct omap_mmc_s *s);
void omap_mmc_handlers(struct omap_mmc_s *s, qemu_irq ro, qemu_irq cover);
# define cpu_is_omap310(cpu) (cpu->mpu_model == omap310)
# define cpu_is_omap1510(cpu) (cpu->mpu_model == omap1510)

25
hw/omap_mmc.c
View file

@ -25,6 +25,7 @@ struct omap_mmc_s {
target_phys_addr_t base;
qemu_irq irq;
qemu_irq *dma;
qemu_irq handler[2];
omap_clk clk;
SDState *card;
uint16_t last_cmd;
@ -506,6 +507,22 @@ void omap_mmc_reset(struct omap_mmc_s *host)
host->transfer = 0;
}
static void omap_mmc_ro_cb(void *opaque, int level)
{
struct omap_mmc_s *s = (struct omap_mmc_s *) opaque;
if (s->handler[0])
qemu_set_irq(s->handler[0], level);
}
static void omap_mmc_cover_cb(void *opaque, int level)
{
struct omap_mmc_s *s = (struct omap_mmc_s *) opaque;
if (s->handler[1])
qemu_set_irq(s->handler[1], level);
}
struct omap_mmc_s *omap_mmc_init(target_phys_addr_t base,
qemu_irq irq, qemu_irq dma[], omap_clk clk)
{
@ -525,7 +542,13 @@ struct omap_mmc_s *omap_mmc_init(target_phys_addr_t base,
/* Instantiate the storage */
s->card = sd_init(sd_bdrv);
sd_set_cb(s->card, s, omap_mmc_ro_cb, omap_mmc_cover_cb);
return s;
}
/* TODO: insertion and read-only handlers */
void omap_mmc_handlers(struct omap_mmc_s *s, qemu_irq ro, qemu_irq cover)
{
s->handler[0] = ro;
s->handler[1] = cover;
}

29
hw/palm.c
View file

@ -57,6 +57,24 @@ static CPUWriteMemoryFunc *static_writefn[] = {
};
/* Palm Tunsgten|E support */
/* Shared GPIOs */
#define PALMTE_USBDETECT_GPIO 0
#define PALMTE_USB_OR_DC_GPIO 1
#define PALMTE_TSC_GPIO 4
#define PALMTE_PINTDAV_GPIO 6
#define PALMTE_MMC_WP_GPIO 8
#define PALMTE_MMC_POWER_GPIO 9
#define PALMTE_HDQ_GPIO 11
#define PALMTE_HEADPHONES_GPIO 14
#define PALMTE_SPEAKER_GPIO 15
/* MPU private GPIOs */
#define PALMTE_DC_GPIO 2
#define PALMTE_MMC_SWITCH_GPIO 4
#define PALMTE_MMC1_GPIO 6
#define PALMTE_MMC2_GPIO 7
#define PALMTE_MMC3_GPIO 11
static void palmte_microwire_setup(struct omap_mpu_state_s *cpu)
{
}
@ -90,6 +108,14 @@ static void palmte_button_event(void *opaque, int keycode)
!(keycode & 0x80));
}
static void palmte_mmc_cover(void *opaque, int line, int level)
{
struct omap_mpu_state_s *cpu = (struct omap_mpu_state_s *) opaque;
qemu_set_irq(omap_mpuio_in_get(cpu->mpuio)[PALMTE_MMC_SWITCH_GPIO],
!level);
}
static void palmte_init(int ram_size, int vga_ram_size, int boot_device,
DisplayState *ds, const char **fd_filename, int snapshot,
const char *kernel_filename, const char *kernel_cmdline,
@ -132,6 +158,9 @@ static void palmte_init(int ram_size, int vga_ram_size, int boot_device,
qemu_add_kbd_event_handler(palmte_button_event, cpu);
omap_mmc_handlers(cpu->mmc, 0,
qemu_allocate_irqs(palmte_mmc_cover, cpu, 1)[0]);
/* Setup initial (reset) machine state */
if (nb_option_roms) {
rom_size = get_image_size(option_rom[0]);