ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SD card emulation (initial implementation by Andrzei Zaborowski). 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2620 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2007-04-06 16:49:48 +00:00
parent 84409ddbda
commit a1bb27b1e9
10 changed files with 2084 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.target
View File

@ -442,8 +442,8 @@ endif
endif endif
ifeq ($(TARGET_BASE_ARCH), arm) ifeq ($(TARGET_BASE_ARCH), arm)
VL_OBJS+= integratorcp.o versatilepb.o ps2.o smc91c111.o arm_pic.o arm_timer.o VL_OBJS+= integratorcp.o versatilepb.o ps2.o smc91c111.o arm_pic.o arm_timer.o
VL_OBJS+= arm_boot.o pl011.o pl050.o pl080.o pl110.o pl190.o VL_OBJS+= arm_boot.o pl011.o pl050.o pl080.o pl110.o pl181.o pl190.o
VL_OBJS+= versatile_pci.o VL_OBJS+= versatile_pci.o sd.o
VL_OBJS+= arm_gic.o realview.o arm_sysctl.o VL_OBJS+= arm_gic.o realview.o arm_sysctl.o
VL_OBJS+= arm-semi.o VL_OBJS+= arm-semi.o
endif endif

3
hw/integratorcp.c
View File

@ -1,7 +1,7 @@
/* /*
* ARM Integrator CP System emulation. * ARM Integrator CP System emulation.
* *
* Copyright (c) 2005-2006 CodeSourcery. * Copyright (c) 2005-2007 CodeSourcery.
* Written by Paul Brook * Written by Paul Brook
* *
* This code is licenced under the GPL * This code is licenced under the GPL
@ -500,6 +500,7 @@ static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device,
icp_control_init(0xcb000000); icp_control_init(0xcb000000);
pl050_init(0x18000000, pic, 3, 0); pl050_init(0x18000000, pic, 3, 0);
pl050_init(0x19000000, pic, 4, 1); pl050_init(0x19000000, pic, 4, 1);
pl181_init(0x1c000000, sd_bdrv, pic, 23, 24);
if (nd_table[0].vlan) { if (nd_table[0].vlan) {
if (nd_table[0].model == NULL if (nd_table[0].model == NULL
|| strcmp(nd_table[0].model, "smc91c111") == 0) { || strcmp(nd_table[0].model, "smc91c111") == 0) {

445
hw/pl181.c Normal file
View File

@ -0,0 +1,445 @@
/*
* Arm PrimeCell PL181 MultiMedia Card Interface
*
* Copyright (c) 2007 CodeSourcery.
* Written by Paul Brook
*
* This code is licenced under the GPL.
*/
#include "vl.h"
#include "sd.h"
//#define DEBUG_PL181 1
#ifdef DEBUG_PL181
#define DPRINTF(fmt, args...) \
do { printf("pl181: " fmt , ##args); } while (0)
#else
#define DPRINTF(fmt, args...) do {} while(0)
#endif
#define PL181_FIFO_LEN 16
typedef struct {
struct sd_state_s *card;
uint32_t base;
uint32_t clock;
uint32_t power;
uint32_t cmdarg;
uint32_t cmd;
uint32_t datatimer;
uint32_t datalength;
uint32_t respcmd;
uint32_t response[4];
uint32_t datactrl;
uint32_t datacnt;
uint32_t status;
uint32_t mask[2];
uint32_t fifocnt;
int fifo_pos;
int fifo_len;
uint32_t fifo[PL181_FIFO_LEN];
void *pic;
int irq[2];
} pl181_state;
#define PL181_CMD_INDEX 0x3f
#define PL181_CMD_RESPONSE (1 << 6)
#define PL181_CMD_LONGRESP (1 << 7)
#define PL181_CMD_INTERRUPT (1 << 8)
#define PL181_CMD_PENDING (1 << 9)
#define PL181_CMD_ENABLE (1 << 10)
#define PL181_DATA_ENABLE (1 << 0)
#define PL181_DATA_DIRECTION (1 << 1)
#define PL181_DATA_MODE (1 << 2)
#define PL181_DATA_DMAENABLE (1 << 3)
#define PL181_STATUS_CMDCRCFAIL (1 << 0)
#define PL181_STATUS_DATACRCFAIL (1 << 1)
#define PL181_STATUS_CMDTIMEOUT (1 << 2)
#define PL181_STATUS_DATATIMEOUT (1 << 3)
#define PL181_STATUS_TXUNDERRUN (1 << 4)
#define PL181_STATUS_RXOVERRUN (1 << 5)
#define PL181_STATUS_CMDRESPEND (1 << 6)
#define PL181_STATUS_CMDSENT (1 << 7)
#define PL181_STATUS_DATAEND (1 << 8)
#define PL181_STATUS_DATABLOCKEND (1 << 10)
#define PL181_STATUS_CMDACTIVE (1 << 11)
#define PL181_STATUS_TXACTIVE (1 << 12)
#define PL181_STATUS_RXACTIVE (1 << 13)
#define PL181_STATUS_TXFIFOHALFEMPTY (1 << 14)
#define PL181_STATUS_RXFIFOHALFFULL (1 << 15)
#define PL181_STATUS_TXFIFOFULL (1 << 16)
#define PL181_STATUS_RXFIFOFULL (1 << 17)
#define PL181_STATUS_TXFIFOEMPTY (1 << 18)
#define PL181_STATUS_RXFIFOEMPTY (1 << 19)
#define PL181_STATUS_TXDATAAVLBL (1 << 20)
#define PL181_STATUS_RXDATAAVLBL (1 << 21)
#define PL181_STATUS_TX_FIFO (PL181_STATUS_TXACTIVE \
|PL181_STATUS_TXFIFOHALFEMPTY \
|PL181_STATUS_TXFIFOFULL \
|PL181_STATUS_TXFIFOEMPTY \
|PL181_STATUS_TXDATAAVLBL)
#define PL181_STATUS_RX_FIFO (PL181_STATUS_RXACTIVE \
|PL181_STATUS_RXFIFOHALFFULL \
|PL181_STATUS_RXFIFOFULL \
|PL181_STATUS_RXFIFOEMPTY \
|PL181_STATUS_RXDATAAVLBL)
static const unsigned char pl181_id[] =
{ 0x81, 0x11, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1 };
static void pl181_update(pl181_state *s)
{
int i;
for (i = 0; i < 2; i++) {
pic_set_irq_new(s->pic, s->irq[i], (s->status & s->mask[i]) != 0);
}
}
static void pl181_fifo_push(pl181_state *s, uint32_t value)
{
int n;
if (s->fifo_len == PL181_FIFO_LEN) {
fprintf(stderr, "pl181: FIFO overflow\n");
return;
}
n = (s->fifo_pos + s->fifo_len) & (PL181_FIFO_LEN - 1);
s->fifo_len++;
s->fifo[n] = value;
DPRINTF("FIFO push %08x\n", (int)value);
}
static uint32_t pl181_fifo_pop(pl181_state *s)
{
uint32_t value;
if (s->fifo_len == 0) {
fprintf(stderr, "pl181: FIFO underflow\n");
return 0;
}
value = s->fifo[s->fifo_pos];
s->fifo_len--;
s->fifo_pos = (s->fifo_pos + 1) & (PL181_FIFO_LEN - 1);
DPRINTF("FIFO pop %08x\n", (int)value);
return value;
}
static void pl181_send_command(pl181_state *s)
{
struct sd_request_s request;
uint8_t response[16];
int rlen;
request.cmd = s->cmd & PL181_CMD_INDEX;
request.arg = s->cmdarg;
DPRINTF("Command %d %08x\n", request.cmd, request.arg);
rlen = sd_do_command(s->card, &request, response);
if (rlen < 0)
goto error;
if (s->cmd & PL181_CMD_RESPONSE) {
#define RWORD(n) ((response[n] << 24) | (response[n + 1] << 16) \
| (response[n + 2] << 8) | response[n + 3])
if (rlen == 0 || (rlen == 4 && (s->cmd & PL181_CMD_LONGRESP)))
goto error;
if (rlen != 4 && rlen != 16)
goto error;
s->response[0] = RWORD(0);
if (rlen == 4) {
s->response[1] = s->response[2] = s->response[3] = 0;
} else {
s->response[1] = RWORD(4);
s->response[2] = RWORD(8);
s->response[3] = RWORD(12) & ~1;
}
DPRINTF("Response recieved\n");
s->status |= PL181_STATUS_CMDRESPEND;
#undef RWORD
} else {
DPRINTF("Command sent\n");
s->status |= PL181_STATUS_CMDSENT;
}
return;
error:
DPRINTF("Timeout\n");
s->status |= PL181_STATUS_CMDTIMEOUT;
}
/* Transfer data between teh card and the FIFO. This is complicated by
the FIFO holding 32-bit words and the card taking data in single byte
chunks. FIFO bytes are transferred in little-endian order. */
static void pl181_fifo_run(pl181_state *s)
{
uint32_t bits;
uint32_t value;
int n;
int limit;
int is_read;
is_read = (s->datactrl & PL181_DATA_DIRECTION) != 0;
if (s->datacnt != 0 && (!is_read || sd_data_ready(s->card))) {
limit = is_read ? PL181_FIFO_LEN : 0;
n = 0;
value = 0;
while (s->datacnt && s->fifo_len != limit) {
if (is_read) {
value |= (uint32_t)sd_read_data(s->card) << (n * 8);
n++;
if (n == 4) {
pl181_fifo_push(s, value);
value = 0;
n = 0;
}
} else {
if (n == 0) {
value = pl181_fifo_pop(s);
n = 4;
}
sd_write_data(s->card, value & 0xff);
value >>= 8;
n--;
}
s->datacnt--;
}
if (n && is_read) {
pl181_fifo_push(s, value);
}
}
s->status &= ~(PL181_STATUS_RX_FIFO | PL181_STATUS_TX_FIFO);
if (s->datacnt == 0) {
s->status |= PL181_STATUS_DATAEND;
/* HACK: */
s->status |= PL181_STATUS_DATABLOCKEND;
DPRINTF("Transfer Complete\n");
}
if (s->datacnt == 0 && s->fifocnt == 0) {
s->datactrl &= ~PL181_DATA_ENABLE;
DPRINTF("Data engine idle\n");
} else {
/* Update FIFO bits. */
bits = PL181_STATUS_TXACTIVE | PL181_STATUS_RXACTIVE;
if (s->fifo_len == 0) {
bits |= PL181_STATUS_TXFIFOEMPTY;
bits |= PL181_STATUS_RXFIFOEMPTY;
} else {
bits |= PL181_STATUS_TXDATAAVLBL;
bits |= PL181_STATUS_RXDATAAVLBL;
}
if (s->fifo_len == 16) {
bits |= PL181_STATUS_TXFIFOFULL;
bits |= PL181_STATUS_RXFIFOFULL;
}
if (s->fifo_len <= 8) {
bits |= PL181_STATUS_TXFIFOHALFEMPTY;
}
if (s->fifo_len >= 8) {
bits |= PL181_STATUS_RXFIFOHALFFULL;
}
if (s->datactrl & PL181_DATA_DIRECTION) {
bits &= PL181_STATUS_RX_FIFO;
} else {
bits &= PL181_STATUS_TX_FIFO;
}
s->status |= bits;
}
}
static uint32_t pl181_read(void *opaque, target_phys_addr_t offset)
{
pl181_state *s = (pl181_state *)opaque;
offset -= s->base;
if (offset >= 0xfe0 && offset < 0x1000) {
return pl181_id[(offset - 0xfe0) >> 2];
}
switch (offset) {
case 0x00: /* Power */
return s->power;
case 0x04: /* Clock */
return s->clock;
case 0x08: /* Argument */
return s->cmdarg;
case 0x0c: /* Command */
return s->cmd;
case 0x10: /* RespCmd */
return s->respcmd;
case 0x14: /* Response0 */
return s->response[0];
case 0x18: /* Response1 */
return s->response[1];
case 0x1c: /* Response2 */
return s->response[2];
case 0x20: /* Response3 */
return s->response[3];
case 0x24: /* DataTimer */
return s->datatimer;
case 0x28: /* DataLength */
return s->datalength;
case 0x2c: /* DataCtrl */
return s->datactrl;
case 0x30: /* DataCnt */
return s->datacnt;
case 0x34: /* Status */
return s->status;
case 0x3c: /* Mask0 */
return s->mask[0];
case 0x40: /* Mask1 */
return s->mask[1];
case 0x48: /* FifoCnt */
return s->fifocnt;
case 0x80: case 0x84: case 0x88: case 0x8c: /* FifoData */
case 0x90: case 0x94: case 0x98: case 0x9c:
case 0xa0: case 0xa4: case 0xa8: case 0xac:
case 0xb0: case 0xb4: case 0xb8: case 0xbc:
if (s->fifocnt == 0) {
fprintf(stderr, "pl181: Unexpected FIFO read\n");
return 0;
} else {
uint32_t value;
s->fifocnt--;
value = pl181_fifo_pop(s);
pl181_fifo_run(s);
pl181_update(s);
return value;
}
default:
cpu_abort (cpu_single_env, "pl181_read: Bad offset %x\n", offset);
return 0;
}
}
static void pl181_write(void *opaque, target_phys_addr_t offset,
uint32_t value)
{
pl181_state *s = (pl181_state *)opaque;
offset -= s->base;
switch (offset) {
case 0x00: /* Power */
s->power = value & 0xff;
break;
case 0x04: /* Clock */
s->clock = value & 0xff;
break;
case 0x08: /* Argument */
s->cmdarg = value;
break;
case 0x0c: /* Command */
s->cmd = value;
if (s->cmd & PL181_CMD_ENABLE) {
if (s->cmd & PL181_CMD_INTERRUPT) {
fprintf(stderr, "pl181: Interrupt mode not implemented\n");
abort();
} if (s->cmd & PL181_CMD_PENDING) {
fprintf(stderr, "pl181: Pending commands not implemented\n");
abort();
} else {
pl181_send_command(s);
pl181_fifo_run(s);
}
/* The command has completed one way or the other. */
s->cmd &= ~PL181_CMD_ENABLE;
}
break;
case 0x24: /* DataTimer */
s->datatimer = value;
break;
case 0x28: /* DataLength */
s->datalength = value & 0xffff;
break;
case 0x2c: /* DataCtrl */
s->datactrl = value & 0xff;
if (value & PL181_DATA_ENABLE) {
s->datacnt = s->datalength;
s->fifocnt = (s->datalength + 3) >> 2;
pl181_fifo_run(s);
}
break;
case 0x38: /* Clear */
s->status &= ~(value & 0x7ff);
break;
case 0x3c: /* Mask0 */
s->mask[0] = value;
break;
case 0x40: /* Mask1 */
s->mask[1] = value;
break;
case 0x80: case 0x84: case 0x88: case 0x8c: /* FifoData */
case 0x90: case 0x94: case 0x98: case 0x9c:
case 0xa0: case 0xa4: case 0xa8: case 0xac:
case 0xb0: case 0xb4: case 0xb8: case 0xbc:
if (s->fifocnt == 0) {
fprintf(stderr, "pl181: Unexpected FIFO write\n");
} else {
s->fifocnt--;
pl181_fifo_push(s, value);
pl181_fifo_run(s);
}
break;
default:
cpu_abort (cpu_single_env, "pl181_write: Bad offset %x\n", offset);
}
pl181_update(s);
}
static CPUReadMemoryFunc *pl181_readfn[] = {
pl181_read,
pl181_read,
pl181_read
};
static CPUWriteMemoryFunc *pl181_writefn[] = {
pl181_write,
pl181_write,
pl181_write
};
static void pl181_reset(void *opaque)
{
pl181_state *s = (pl181_state *)opaque;
s->power = 0;
s->cmdarg = 0;
s->cmd = 0;
s->datatimer = 0;
s->datalength = 0;
s->respcmd = 0;
s->response[0] = 0;
s->response[1] = 0;
s->response[2] = 0;
s->response[3] = 0;
s->datatimer = 0;
s->datalength = 0;
s->datactrl = 0;
s->datacnt = 0;
s->status = 0;
s->mask[0] = 0;
s->mask[1] = 0;
s->fifocnt = 0;
}
void pl181_init(uint32_t base, BlockDriverState *bd,
void *pic, int irq0, int irq1)
{
int iomemtype;
pl181_state *s;
s = (pl181_state *)qemu_mallocz(sizeof(pl181_state));
iomemtype = cpu_register_io_memory(0, pl181_readfn,
pl181_writefn, s);
cpu_register_physical_memory(base, 0x00000fff, iomemtype);
s->base = base;
s->card = sd_init(bd);
s->pic = pic;
s->irq[0] = irq0;
s->irq[1] = irq1;
qemu_register_reset(pl181_reset, s);
pl181_reset(s);
/* ??? Save/restore. */
}

4
hw/realview.c
View File

@ -1,7 +1,7 @@
/* /*
* ARM RealView Baseboard System emulation. * ARM RealView Baseboard System emulation.
* *
* Copyright (c) 2006 CodeSourcery. * Copyright (c) 2006-2007 CodeSourcery.
* Written by Paul Brook * Written by Paul Brook
* *
* This code is licenced under the GPL. * This code is licenced under the GPL.
@ -55,6 +55,8 @@ static void realview_init(int ram_size, int vga_ram_size, int boot_device,
pl110_init(ds, 0x10020000, pic, 23, 1); pl110_init(ds, 0x10020000, pic, 23, 1);
pl181_init(0x10005000, sd_bdrv, pic, 17, 18);
pci_bus = pci_vpb_init(pic, 48, 1); pci_bus = pci_vpb_init(pic, 48, 1);
if (usb_enabled) { if (usb_enabled) {
usb_ohci_init_pci(pci_bus, 3, -1); usb_ohci_init_pci(pci_bus, 3, -1);

1508
hw/sd.c Normal file
View File

File diff suppressed because it is too large Load Diff

82
hw/sd.h Normal file
View File

@ -0,0 +1,82 @@
/*
* SD Memory Card emulation. Mostly correct for MMC too.
*
* Copyright (c) 2006 Andrzej Zaborowski <balrog@zabor.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef __hw_sd_h
#define __hw_sd_h 1
#include <vl.h>
#define OUT_OF_RANGE (1 << 31)
#define ADDRESS_ERROR (1 << 30)
#define BLOCK_LEN_ERROR (1 << 29)
#define ERASE_SEQ_ERROR (1 << 28)
#define ERASE_PARAM (1 << 27)
#define WP_VIOLATION (1 << 26)
#define CARD_IS_LOCKED (1 << 25)
#define LOCK_UNLOCK_FAILED (1 << 24)
#define COM_CRC_ERROR (1 << 23)
#define ILLEGAL_COMMAND (1 << 22)
#define CARD_ECC_FAILED (1 << 21)
#define CC_ERROR (1 << 20)
#define SD_ERROR (1 << 19)
#define CID_CSD_OVERWRITE (1 << 16)
#define WP_ERASE_SKIP (1 << 15)
#define CARD_ECC_DISABLED (1 << 14)
#define ERASE_RESET (1 << 13)
#define CURRENT_STATE (7 << 9)
#define READY_FOR_DATA (1 << 8)
#define APP_CMD (1 << 5)
#define AKE_SEQ_ERROR (1 << 3)
typedef enum {
sd_none = -1,
sd_bc = 0, /* broadcast -- no response */
sd_bcr, /* broadcast with response */
sd_ac, /* addressed -- no data transfer */
sd_adtc, /* addressed with data transfer */
} sd_cmd_type_t;
struct sd_request_s {
uint8_t cmd;
uint32_t arg;
uint8_t crc;
};
typedef struct SDState SDState;
SDState *sd_init(BlockDriverState *bs);
int sd_do_command(SDState *sd, struct sd_request_s *req,
uint8_t *response);
void sd_write_data(SDState *sd, uint8_t value);
uint8_t sd_read_data(SDState *sd);
void sd_set_cb(SDState *sd, void *opaque,
void (*readonly_cb)(void *, int),
void (*inserted_cb)(void *, int));
int sd_data_ready(SDState *sd);
#endif /* __hw_sd_h */

12
hw/versatilepb.c
View File

@ -1,7 +1,7 @@
/* /*
* ARM Versatile Platform/Application Baseboard System emulation. * ARM Versatile Platform/Application Baseboard System emulation.
* *
* Copyright (c) 2005-2006 CodeSourcery. * Copyright (c) 2005-2007 CodeSourcery.
* Written by Paul Brook * Written by Paul Brook
* *
* This code is licenced under the GPL. * This code is licenced under the GPL.
@ -217,19 +217,25 @@ static void versatile_init(int ram_size, int vga_ram_size, int boot_device,
that includes hardware cursor support from the PL111. */ that includes hardware cursor support from the PL111. */
pl110_init(ds, 0x10120000, pic, 16, 1); pl110_init(ds, 0x10120000, pic, 16, 1);
pl181_init(0x10005000, sd_bdrv, sic, 22, 1);
#if 0
/* Disabled because there's no way of specifying a block device. */
pl181_init(0x1000b000, NULL, sic, 23, 2);
#endif
/* Memory map for Versatile/PB: */ /* Memory map for Versatile/PB: */
/* 0x10000000 System registers. */ /* 0x10000000 System registers. */
/* 0x10001000 PCI controller config registers. */ /* 0x10001000 PCI controller config registers. */
/* 0x10002000 Serial bus interface. */ /* 0x10002000 Serial bus interface. */
/* 0x10003000 Secondary interrupt controller. */ /* 0x10003000 Secondary interrupt controller. */
/* 0x10004000 AACI (audio). */ /* 0x10004000 AACI (audio). */
/* 0x10005000 MMCI0. */ /* 0x10005000 MMCI0. */
/* 0x10006000 KMI0 (keyboard). */ /* 0x10006000 KMI0 (keyboard). */
/* 0x10007000 KMI1 (mouse). */ /* 0x10007000 KMI1 (mouse). */
/* 0x10008000 Character LCD Interface. */ /* 0x10008000 Character LCD Interface. */
/* 0x10009000 UART3. */ /* 0x10009000 UART3. */
/* 0x1000a000 Smart card 1. */ /* 0x1000a000 Smart card 1. */
/* 0x1000b000 MMCI1. */ /* 0x1000b000 MMCI1. */
/* 0x10010000 Ethernet. */ /* 0x10010000 Ethernet. */
/* 0x10020000 USB. */ /* 0x10020000 USB. */
/* 0x10100000 SSMC. */ /* 0x10100000 SSMC. */

6
qemu-doc.texi
View File

@ -1719,6 +1719,8 @@ SMC 91c111 Ethernet adapter
PL110 LCD controller PL110 LCD controller
@item @item
PL050 KMI with PS/2 keyboard and mouse. PL050 KMI with PS/2 keyboard and mouse.
@item
PL181 MultiMedia Card Interface with SD card.
@end itemize @end itemize
The ARM Versatile baseboard is emulated with the following devices: The ARM Versatile baseboard is emulated with the following devices:
@ -1746,6 +1748,8 @@ mapped control registers.
PCI OHCI USB controller. PCI OHCI USB controller.
@item @item
LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM devices. LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM devices.
@item
PL181 MultiMedia Card Interface with SD card.
@end itemize @end itemize
The ARM RealView Emulation baseboard is emulated with the following devices: The ARM RealView Emulation baseboard is emulated with the following devices:
@ -1769,6 +1773,8 @@ PCI host bridge
PCI OHCI USB controller PCI OHCI USB controller
@item @item
LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM devices LSI53C895A PCI SCSI Host Bus Adapter with hard disk and CD-ROM devices
@item
PL181 MultiMedia Card Interface with SD card.
@end itemize @end itemize
A Linux 2.6 test image is available on the QEMU web site. More A Linux 2.6 test image is available on the QEMU web site. More

23
vl.c
View File

@ -138,6 +138,7 @@ IOPortWriteFunc *ioport_write_table[3][MAX_IOPORTS];
/* Note: bs_table[MAX_DISKS] is a dummy block driver if none available /* Note: bs_table[MAX_DISKS] is a dummy block driver if none available
to store the VM snapshots */ to store the VM snapshots */
BlockDriverState *bs_table[MAX_DISKS + 1], *fd_table[MAX_FD]; BlockDriverState *bs_table[MAX_DISKS + 1], *fd_table[MAX_FD];
BlockDriverState *sd_bdrv;
/* point to the block driver where the snapshots are managed */ /* point to the block driver where the snapshots are managed */
BlockDriverState *bs_snapshots; BlockDriverState *bs_snapshots;
int vga_ram_size; int vga_ram_size;
@ -6345,6 +6346,7 @@ void help(void)
"-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n" "-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n"
"-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n" "-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n"
"-cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master)\n" "-cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master)\n"
"-sd file use 'file' as SecureDigital card image\n"
"-boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n)\n" "-boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n)\n"
"-snapshot write to temporary files instead of disk image files\n" "-snapshot write to temporary files instead of disk image files\n"
#ifdef CONFIG_SDL #ifdef CONFIG_SDL
@ -6482,6 +6484,7 @@ enum {
QEMU_OPTION_hdc, QEMU_OPTION_hdc,
QEMU_OPTION_hdd, QEMU_OPTION_hdd,
QEMU_OPTION_cdrom, QEMU_OPTION_cdrom,
QEMU_OPTION_sd,
QEMU_OPTION_boot, QEMU_OPTION_boot,
QEMU_OPTION_snapshot, QEMU_OPTION_snapshot,
#ifdef TARGET_I386 #ifdef TARGET_I386
@ -6560,6 +6563,7 @@ const QEMUOption qemu_options[] = {
{ "hdc", HAS_ARG, QEMU_OPTION_hdc }, { "hdc", HAS_ARG, QEMU_OPTION_hdc },
{ "hdd", HAS_ARG, QEMU_OPTION_hdd }, { "hdd", HAS_ARG, QEMU_OPTION_hdd },
{ "cdrom", HAS_ARG, QEMU_OPTION_cdrom }, { "cdrom", HAS_ARG, QEMU_OPTION_cdrom },
{ "sd", HAS_ARG, QEMU_OPTION_sd },
{ "boot", HAS_ARG, QEMU_OPTION_boot }, { "boot", HAS_ARG, QEMU_OPTION_boot },
{ "snapshot", 0, QEMU_OPTION_snapshot }, { "snapshot", 0, QEMU_OPTION_snapshot },
#ifdef TARGET_I386 #ifdef TARGET_I386
@ -6847,6 +6851,7 @@ int main(int argc, char **argv)
int snapshot, linux_boot; int snapshot, linux_boot;
const char *initrd_filename; const char *initrd_filename;
const char *hd_filename[MAX_DISKS], *fd_filename[MAX_FD]; const char *hd_filename[MAX_DISKS], *fd_filename[MAX_FD];
const char *sd_filename;
const char *kernel_filename, *kernel_cmdline; const char *kernel_filename, *kernel_cmdline;
DisplayState *ds = &display_state; DisplayState *ds = &display_state;
int cyls, heads, secs, translation; int cyls, heads, secs, translation;
@ -6907,6 +6912,7 @@ int main(int argc, char **argv)
fd_filename[i] = NULL; fd_filename[i] = NULL;
for(i = 0; i < MAX_DISKS; i++) for(i = 0; i < MAX_DISKS; i++)
hd_filename[i] = NULL; hd_filename[i] = NULL;
sd_filename = NULL;
ram_size = DEFAULT_RAM_SIZE * 1024 * 1024; ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
vga_ram_size = VGA_RAM_SIZE; vga_ram_size = VGA_RAM_SIZE;
#ifdef CONFIG_GDBSTUB #ifdef CONFIG_GDBSTUB
@ -7025,6 +7031,9 @@ int main(int argc, char **argv)
cdrom_index = -1; cdrom_index = -1;
} }
break; break;
case QEMU_OPTION_sd:
sd_filename = optarg;
break;
case QEMU_OPTION_snapshot: case QEMU_OPTION_snapshot:
snapshot = 1; snapshot = 1;
break; break;
@ -7523,7 +7532,7 @@ int main(int argc, char **argv)
fd_table[i] = bdrv_new(buf); fd_table[i] = bdrv_new(buf);
bdrv_set_type_hint(fd_table[i], BDRV_TYPE_FLOPPY); bdrv_set_type_hint(fd_table[i], BDRV_TYPE_FLOPPY);
} }
if (fd_filename[i] != '\0') { if (fd_filename[i][0] != '\0') {
if (bdrv_open(fd_table[i], fd_filename[i], if (bdrv_open(fd_table[i], fd_filename[i],
snapshot ? BDRV_O_SNAPSHOT : 0) < 0) { snapshot ? BDRV_O_SNAPSHOT : 0) < 0) {
fprintf(stderr, "qemu: could not open floppy disk image '%s'\n", fprintf(stderr, "qemu: could not open floppy disk image '%s'\n",
@ -7534,6 +7543,18 @@ int main(int argc, char **argv)
} }
} }
sd_bdrv = bdrv_new ("sd");
/* FIXME: This isn't really a floppy, but it's a reasonable
approximation. */
bdrv_set_type_hint(sd_bdrv, BDRV_TYPE_FLOPPY);
if (sd_filename) {
if (bdrv_open(sd_bdrv, sd_filename,
snapshot ? BDRV_O_SNAPSHOT : 0) < 0) {
fprintf(stderr, "qemu: could not open SD card image %s\n",
sd_filename);
}
}
register_savevm("timer", 0, 2, timer_save, timer_load, NULL); register_savevm("timer", 0, 2, timer_save, timer_load, NULL);
register_savevm("ram", 0, 2, ram_save, ram_load, NULL); register_savevm("ram", 0, 2, ram_save, ram_load, NULL);

5
vl.h
View File

@ -956,6 +956,7 @@ extern uint8_t _translate_keycode(const int key);
#define MAX_DISKS 4 #define MAX_DISKS 4
extern BlockDriverState *bs_table[MAX_DISKS + 1]; extern BlockDriverState *bs_table[MAX_DISKS + 1];
extern BlockDriverState *sd_bdrv;
void isa_ide_init(int iobase, int iobase2, int irq, void isa_ide_init(int iobase, int iobase2, int irq,
BlockDriverState *hd0, BlockDriverState *hd1); BlockDriverState *hd0, BlockDriverState *hd1);
@ -1385,6 +1386,10 @@ void pl050_init(uint32_t base, void *pic, int irq, int is_mouse);
/* pl080.c */ /* pl080.c */
void *pl080_init(uint32_t base, void *pic, int irq, int nchannels); void *pl080_init(uint32_t base, void *pic, int irq, int nchannels);
/* pl181.c */
void pl181_init(uint32_t base, BlockDriverState *bd,
void *pic, int irq0, int irq1);
/* pl190.c */ /* pl190.c */
void *pl190_init(uint32_t base, void *parent, int irq, int fiq); void *pl190_init(uint32_t base, void *parent, int irq, int fiq);