Message ID | 1386887022-11532-3-git-send-email-antonynpavlov@gmail.com |
---|---|
State | New |
Headers | show |
On Fri, Dec 13, 2013 at 8:23 AM, Antony Pavlov <antonynpavlov@gmail.com> wrote: > Also this patch adds initial support for Canon > PowerShot A1100 IS compact camera. > > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> > --- > hw/arm/Makefile.objs | 1 + > hw/arm/digic_boards.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 84 insertions(+) > create mode 100644 hw/arm/digic_boards.c > > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index 8789807..d7d37f2 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -1,4 +1,5 @@ > obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o > +obj-$(CONFIG_DIGIC) += digic_boards.o > obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o > obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o > obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o > diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c > new file mode 100644 > index 0000000..20c8054 > --- /dev/null > +++ b/hw/arm/digic_boards.c > @@ -0,0 +1,83 @@ > +/* > + * QEMU model of the Canon DIGIC boards (cameras indeed :). > + * > + * Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com> > + * > + * This model is based on reverse engineering efforts > + * made by CHDK (http://chdk.wikia.com) and > + * Magic Lantern (http://www.magiclantern.fm) projects > + * contributors. > + * > + * See docs here: > + * http://magiclantern.wikia.com/wiki/Register_Map > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + */ > + > +#include "hw/boards.h" > +#include "exec/address-spaces.h" > +#include "hw/arm/digic.h" > + > +typedef struct DigicBoardState { > + DigicState *digic; Probably a question for Andreas or Peter, but why the layer of indirection? can't the digic SoC be embedded in the board much the same way Devices embed in a SoC? > + MemoryRegion ram; > +} DigicBoardState; > + > +typedef struct DigicBoard { > + hwaddr ram_size; > +} DigicBoard; > + > +static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) > +{ > + memory_region_init_ram(&s->ram, NULL, "ram", ram_size); > + memory_region_add_subregion(get_system_memory(), 0, &s->ram); > + vmstate_register_ram_global(&s->ram); > +} > + > +static void digic4_board_init(DigicBoard *board) > +{ > + Error *err = NULL; > + > + DigicBoardState *s = g_new(DigicBoardState, 1); > + > + s->digic = DIGIC(object_new(TYPE_DIGIC)); Then this becomes an object_initialize. > + object_property_set_bool(OBJECT(s->digic), true, "realized", &err); > + if (err != NULL) { > + fprintf(stderr, "Couldn't realize DIGIC SoC: %s\n", > + error_get_pretty(err)); > + exit(1); error_report(). Regards, Peter > + } > + > + digic4_board_setup_ram(s, board->ram_size); > +} > + > +static DigicBoard digic4_board_canon_a1100 = { > + .ram_size = 64 * 1024 * 1024, > +}; > + > +static void canon_a1100_init(QEMUMachineInitArgs *args) > +{ > + digic4_board_init(&digic4_board_canon_a1100); > +} > + > +static QEMUMachine canon_a1100 = { > + .name = "canon-a1100", > + .desc = "Canon PowerShot A1100 IS", > + .init = &canon_a1100_init, > +}; > + > +static void digic_register_machines(void) > +{ > + qemu_register_machine(&canon_a1100); > +} > + > +machine_init(digic_register_machines) > -- > 1.8.5 > >
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 8789807..d7d37f2 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,4 +1,5 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o +obj-$(CONFIG_DIGIC) += digic_boards.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c new file mode 100644 index 0000000..20c8054 --- /dev/null +++ b/hw/arm/digic_boards.c @@ -0,0 +1,83 @@ +/* + * QEMU model of the Canon DIGIC boards (cameras indeed :). + * + * Copyright (C) 2013 Antony Pavlov <antonynpavlov@gmail.com> + * + * This model is based on reverse engineering efforts + * made by CHDK (http://chdk.wikia.com) and + * Magic Lantern (http://www.magiclantern.fm) projects + * contributors. + * + * See docs here: + * http://magiclantern.wikia.com/wiki/Register_Map + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include "hw/boards.h" +#include "exec/address-spaces.h" +#include "hw/arm/digic.h" + +typedef struct DigicBoardState { + DigicState *digic; + MemoryRegion ram; +} DigicBoardState; + +typedef struct DigicBoard { + hwaddr ram_size; +} DigicBoard; + +static void digic4_board_setup_ram(DigicBoardState *s, hwaddr ram_size) +{ + memory_region_init_ram(&s->ram, NULL, "ram", ram_size); + memory_region_add_subregion(get_system_memory(), 0, &s->ram); + vmstate_register_ram_global(&s->ram); +} + +static void digic4_board_init(DigicBoard *board) +{ + Error *err = NULL; + + DigicBoardState *s = g_new(DigicBoardState, 1); + + s->digic = DIGIC(object_new(TYPE_DIGIC)); + object_property_set_bool(OBJECT(s->digic), true, "realized", &err); + if (err != NULL) { + fprintf(stderr, "Couldn't realize DIGIC SoC: %s\n", + error_get_pretty(err)); + exit(1); + } + + digic4_board_setup_ram(s, board->ram_size); +} + +static DigicBoard digic4_board_canon_a1100 = { + .ram_size = 64 * 1024 * 1024, +}; + +static void canon_a1100_init(QEMUMachineInitArgs *args) +{ + digic4_board_init(&digic4_board_canon_a1100); +} + +static QEMUMachine canon_a1100 = { + .name = "canon-a1100", + .desc = "Canon PowerShot A1100 IS", + .init = &canon_a1100_init, +}; + +static void digic_register_machines(void) +{ + qemu_register_machine(&canon_a1100); +} + +machine_init(digic_register_machines)
Also this patch adds initial support for Canon PowerShot A1100 IS compact camera. Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com> --- hw/arm/Makefile.objs | 1 + hw/arm/digic_boards.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 hw/arm/digic_boards.c