From: Igor Mammedov <imammedo@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: "Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Sarah Harris" <S.E.Harris@kent.ac.uk>,
qemu-devel@nongnu.org, "Michael Rolnik" <mrolnik@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Phillip Stevens" <phillip.stevens@gmail.com>
Subject: Re: [PATCH v3 4/8] hw/avr: Add some Arduino boards
Date: Mon, 20 Jan 2020 10:03:35 +0100 [thread overview]
Message-ID: <20200120100335.58f1b7d2@redhat.com> (raw)
In-Reply-To: <20191229224505.24466-5-f4bug@amsat.org>
On Sun, 29 Dec 2019 23:45:01 +0100
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Arduino boards are build with AVR chipsets.
> Add some of the popular boards:
>
> - Arduino Duemilanove
> - Arduino Uno
> - Arduino Mega
>
> For more information:
> https://www.arduino.cc/en/Main/Products
> https://store.arduino.cc/arduino-genuino/most-popular
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> v2:
> - Reword description adding more information (Aleksandar)
> - Use DEFINE_TYPES (Igor)
>
> Cc: Phillip Stevens <phillip.stevens@gmail.com>
> Cc: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/avr/arduino.c | 177 +++++++++++++++++++++++++++++++++++++++++++
> hw/avr/Makefile.objs | 1 +
> 2 files changed, 178 insertions(+)
> create mode 100644 hw/avr/arduino.c
>
> diff --git a/hw/avr/arduino.c b/hw/avr/arduino.c
> new file mode 100644
> index 0000000000..ecaaa295d8
> --- /dev/null
> +++ b/hw/avr/arduino.c
> @@ -0,0 +1,177 @@
> +/*
> + * QEMU Arduino boards
> + *
> + * Copyright (c) 2019 Philippe Mathieu-Daudé
> + *
> + * This work is licensed under the terms of the GNU GPLv2 or later.
> + * See the COPYING file in the top-level directory.
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +/* TODO: Implement the use of EXTRAM */
> +
> +#include "qemu/osdep.h"
> +#include "qemu-common.h"
> +#include "qapi/error.h"
> +#include "hw/boards.h"
> +#include "hw/loader.h"
> +#include "elf.h"
> +#include "atmega.h"
> +
> +typedef struct ArduinoMachineState {
[...]
> + MemoryRegion extram;
> +} ArduinoMachineState;
> +
> +typedef struct ArduinoMachineClass {
[...]
> + size_t extram_size;
extfoo doesn't seem to be used in this patch
> +} ArduinoMachineClass;
> +
> +#define TYPE_ARDUINO_MACHINE \
> + MACHINE_TYPE_NAME("arduino")
> +#define ARDUINO_MACHINE(obj) \
> + OBJECT_CHECK(ArduinoMachineState, (obj), TYPE_ARDUINO_MACHINE)
> +#define ARDUINO_MACHINE_CLASS(klass) \
> + OBJECT_CLASS_CHECK(ArduinoMachineClass, (klass), TYPE_ARDUINO_MACHINE)
> +#define ARDUINO_MACHINE_GET_CLASS(obj) \
> + OBJECT_GET_CLASS(ArduinoMachineClass, (obj), TYPE_ARDUINO_MACHINE)
> +
> +static void load_firmware(const char *firmware, uint64_t flash_size)
> +{
> + const char *filename;
> + int bytes_loaded;
> +
> + /* Load firmware (contents of flash) trying to auto-detect format */
> + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, firmware);
> + if (filename == NULL) {
> + error_report("Unable to find %s", firmware);
> + exit(1);
> + }
> +
> + bytes_loaded = load_elf(filename, NULL, NULL, NULL, NULL, NULL, NULL,
> + 0, EM_NONE, 0, 0);
> + if (bytes_loaded < 0) {
> + bytes_loaded = load_image_targphys(filename, OFFSET_CODE, flash_size);
> + }
> + if (bytes_loaded < 0) {
> + error_report("Unable to load firmware image %s as ELF or raw binary",
> + firmware);
> + exit(1);
> + }
> +}
> +
> +static void arduino_machine_init(MachineState *machine)
> +{
> + ArduinoMachineClass *amc = ARDUINO_MACHINE_GET_CLASS(machine);
> + ArduinoMachineState *ams = ARDUINO_MACHINE(machine);
> +
> + sysbus_init_child_obj(OBJECT(machine), "mcu", &ams->mcu, sizeof(ams->mcu),
> + amc->mcu_type);
> + object_property_set_uint(OBJECT(&ams->mcu), amc->xtal_hz,
> + "xtal-frequency-hz", &error_abort);
> + object_property_set_bool(OBJECT(&ams->mcu), true, "realized",
> + &error_abort);
> +
> + if (machine->firmware) {
> + load_firmware(machine->firmware, memory_region_size(&ams->mcu.flash));
> + }
> +}
> +
> +static void arduino_machine_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> + mc->init = arduino_machine_init;
> + mc->default_cpus = 1;
> + mc->min_cpus = mc->default_cpus;
> + mc->max_cpus = mc->default_cpus;
> + mc->no_floppy = 1;
> + mc->no_cdrom = 1;
> + mc->no_parallel = 1;
> +}
> +
> +static void arduino_duemilanove_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
> +
> + /* https://www.arduino.cc/en/Main/ArduinoBoardDuemilanove */
> + mc->desc = "Arduino Duemilanove (ATmega168)",
> + mc->alias = "2009";
> + amc->mcu_type = TYPE_ATMEGA168_MCU;
> + amc->xtal_hz = 16 * 1000 * 1000;
> +};
> +
> +static void arduino_uno_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
> +
> + /* https://store.arduino.cc/arduino-uno-rev3 */
> + mc->desc = "Arduino UNO (ATmega328P)";
> + mc->alias = "uno";
> + amc->mcu_type = TYPE_ATMEGA328_MCU;
> + amc->xtal_hz = 16 * 1000 * 1000;
> +};
> +
> +static void arduino_mega_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
> +
> + /* https://www.arduino.cc/en/Main/ArduinoBoardMega */
> + mc->desc = "Arduino Mega (ATmega1280)";
> + mc->alias = "mega";
> + amc->mcu_type = TYPE_ATMEGA1280_MCU;
> + amc->xtal_hz = 16 * 1000 * 1000;
> +};
> +
> +static void arduino_mega2560_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> + ArduinoMachineClass *amc = ARDUINO_MACHINE_CLASS(oc);
> +
> + /* https://store.arduino.cc/arduino-mega-2560-rev3 */
> + mc->desc = "Arduino Mega 2560 (ATmega2560)";
> + mc->alias = "mega2560";
> + mc->is_default = true;
> + amc->mcu_type = TYPE_ATMEGA2560_MCU;
> + amc->xtal_hz = 16 * 1000 * 1000; /* CSTCE16M0V53-R0 */
> +};
> +
> +static const TypeInfo arduino_machine_types[] = {
> + {
> + .name = MACHINE_TYPE_NAME("arduino-duemilanove"),
> + .parent = TYPE_ARDUINO_MACHINE,
> + .class_init = arduino_duemilanove_class_init,
> + }, {
> + .name = MACHINE_TYPE_NAME("arduino-uno"),
> + .parent = TYPE_ARDUINO_MACHINE,
> + .class_init = arduino_uno_class_init,
> + }, {
> + .name = MACHINE_TYPE_NAME("arduino-mega"),
> + .parent = TYPE_ARDUINO_MACHINE,
> + .class_init = arduino_mega_class_init,
> + }, {
> + .name = MACHINE_TYPE_NAME("arduino-mega-2560-v3"),
> + .parent = TYPE_ARDUINO_MACHINE,
> + .class_init = arduino_mega2560_class_init,
> + }, {
> + .name = TYPE_ARDUINO_MACHINE,
> + .parent = TYPE_MACHINE,
> + .instance_size = sizeof(ArduinoMachineState),
> + .class_size = sizeof(ArduinoMachineClass),
> + .class_init = arduino_machine_class_init,
> + .abstract = true,
> + }
> +};
> +
> +DEFINE_TYPES(arduino_machine_types)
> diff --git a/hw/avr/Makefile.objs b/hw/avr/Makefile.objs
> index 4b6b911820..39ee3c32b2 100644
> --- a/hw/avr/Makefile.objs
> +++ b/hw/avr/Makefile.objs
> @@ -1,2 +1,3 @@
> obj-y += sample.o
> obj-y += atmega.o
> +obj-y += arduino.o
next prev parent reply other threads:[~2020-01-20 9:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-29 22:44 [PATCH v3 0/8] hw/avr: Introduce the Arduino boards Philippe Mathieu-Daudé
2019-12-29 22:44 ` [PATCH v3 1/8] hw/char/avr: Reduce USART I/O size Philippe Mathieu-Daudé
2019-12-29 22:44 ` [PATCH v3 2/8] hw/timer/avr_timer16: Rename memory region debugging name Philippe Mathieu-Daudé
2019-12-29 22:45 ` [PATCH v3 3/8] hw/avr: Add some ATmega microcontrollers Philippe Mathieu-Daudé
2019-12-29 22:45 ` [PATCH v3 4/8] hw/avr: Add some Arduino boards Philippe Mathieu-Daudé
2020-01-20 9:03 ` Igor Mammedov [this message]
2020-01-20 9:21 ` Philippe Mathieu-Daudé
2020-01-20 10:09 ` Igor Mammedov
2020-01-20 11:05 ` Philippe Mathieu-Daudé
2020-01-20 14:48 ` Igor Mammedov
2019-12-29 22:45 ` [PATCH v3 5/8] tests/boot-serial-test: Test some Arduino boards (AVR based) Philippe Mathieu-Daudé
2019-12-29 22:45 ` [PATCH v3 6/8] tests/acceptance: Do not set the machine type manually Philippe Mathieu-Daudé
2019-12-30 14:10 ` Wainer dos Santos Moschetta
2019-12-29 22:45 ` [PATCH v3 7/8] tests/acceptance: Keep multilines comment consistent with other tests Philippe Mathieu-Daudé
2019-12-29 22:45 ` [PATCH v3 8/8] tests/acceptance: Test the Arduino MEGA2560 board Philippe Mathieu-Daudé
2019-12-29 22:57 ` [PATCH v3 0/8] hw/avr: Introduce the Arduino boards no-reply
2019-12-29 23:18 ` Philippe Mathieu-Daudé
2019-12-30 18:17 ` Michael Rolnik
2020-01-19 22:50 ` Philippe Mathieu-Daudé
2020-01-20 5:29 ` Michael Rolnik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120100335.58f1b7d2@redhat.com \
--to=imammedo@redhat.com \
--cc=S.E.Harris@kent.ac.uk \
--cc=f4bug@amsat.org \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mrolnik@gmail.com \
--cc=pbonzini@redhat.com \
--cc=phillip.stevens@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).