Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
hw/fw_cfg.c | 22 ++++++++++++++++++++++
hw/fw_cfg.h | 22 +++++++++++++++++++++-
2 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 2e3662d..1dd7d6a 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -47,6 +47,7 @@ typedef struct _FWCfgEntry {
struct _FWCfgState {
FWCfgEntry entries[2][FW_CFG_MAX_ENTRY];
+ FWCfgFiles *files;
uint16_t cur_entry;
uint32_t cur_offset;
};
@@ -273,6 +274,27 @@ int fw_cfg_add_callback(FWCfgState *s, uint16_t key,
FWCfgCallback callback,
return 1;
}
+int fw_cfg_add_file(FWCfgState *s, uint8_t type, uint8_t *data, uint32_t len)
+{
+ if (!s->files) {
+ int dsize = sizeof(uint32_t) + sizeof(FWCfgFile) * FW_CFG_FILE_SLOTS;
+ s->files = qemu_mallocz(dsize);
+ fw_cfg_add_bytes(s, FW_CFG_FILE_DIR, (uint8_t*)s->files, dsize);
+ }
+ if (s->files->count == FW_CFG_FILE_SLOTS) {
+ fprintf(stderr, "fw_cfg: out of file slots\n");
+ return 0;
+ }
+
+ fw_cfg_add_bytes(s, FW_CFG_FILE_FIRST + s->files->count, data, len);
+ s->files->f[s->files->count].type = type;
+ s->files->f[s->files->count].size = len;
+ s->files->f[s->files->count].select = FW_CFG_FILE_FIRST + s->files->count;
+ s->files->count++;
+
+ return 1;
+}
+
FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port,
target_phys_addr_t ctl_addr, target_phys_addr_t
data_addr)
{
diff --git a/hw/fw_cfg.h b/hw/fw_cfg.h
index b06665e..460d64d 100644
--- a/hw/fw_cfg.h
+++ b/hw/fw_cfg.h
@@ -26,7 +26,11 @@
#define FW_CFG_SETUP_ADDR 0x16
#define FW_CFG_SETUP_SIZE 0x17
#define FW_CFG_SETUP_DATA 0x18
-#define FW_CFG_MAX_ENTRY 0x19
+#define FW_CFG_FILE_DIR 0x19
+
+#define FW_CFG_FILE_FIRST 0x20
+#define FW_CFG_FILE_SLOTS 0x10
+#define FW_CFG_MAX_ENTRY (FW_CFG_FILE_FIRST+FW_CFG_FILE_SLOTS)
#define FW_CFG_WRITE_CHANNEL 0x4000
#define FW_CFG_ARCH_LOCAL 0x8000
@@ -34,6 +38,22 @@
#define FW_CFG_INVALID 0xffff
+#define FW_CFG_FILE_TYPE_UNKNOWN 0
+#define FW_CFG_FILE_TYPE_VGABIOS 1
+#define FW_CFG_FILE_TYPE_OPTIONROM 2
+
+typedef struct FWCfgFile {
+ uint32_t size; /* file size */
+ uint16_t select; /* write this to 0x510 to read it */
+ uint8_t type; /* vga, option, other? */
+ uint8_t reserved;
+} FWCfgFile;
+
+typedef struct FWCfgFiles {
+ uint32_t count;
+ FWCfgFile f[];
+} FWCfgFiles;
+
#ifndef NO_QEMU_PROTOS
typedef void (*FWCfgCallback)(void *opaque, uint8_t *data);
--
1.6.5.2
