From patchwork Mon Dec 16 10:15:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antony Pavlov X-Patchwork-Id: 301606 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7A0B92C007A for ; Mon, 16 Dec 2013 21:11:16 +1100 (EST) Received: from localhost ([::1]:55030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsV8q-00034t-OW for incoming@patchwork.ozlabs.org; Mon, 16 Dec 2013 05:11:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsV6H-0007mS-7U for qemu-devel@nongnu.org; Mon, 16 Dec 2013 05:08:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsV6C-0005tq-Fq for qemu-devel@nongnu.org; Mon, 16 Dec 2013 05:08:33 -0500 Received: from mail-lb0-x22b.google.com ([2a00:1450:4010:c04::22b]:46034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsV6C-0005tb-3y for qemu-devel@nongnu.org; Mon, 16 Dec 2013 05:08:28 -0500 Received: by mail-lb0-f171.google.com with SMTP id w7so767777lbi.16 for ; Mon, 16 Dec 2013 02:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W0Db9FgWG3G40Ilv5k8gkP6Sj/oMk7n70l+8G5QYT40=; b=PZonoFoHb/YW5TQPc4NljJFrn7Nh8uCbNujGYq0rg1UWtHDhWPjF40lr72APyiV2Oz T/Oi6dr2IAgUDBFKMtnIFSIuUxkHx251yuNwxEgUqUQU9UtPTLLZsr1WHV+x9+CJrwY9 O96kZ7wY1n7PZR1+YZQjbamdlepeZ18TfH/Rr3qM5uTI9E+7oRDsrlnD8NqPmW9lDkTN kNSH90q31WBmCqrdYVcPsIZoBcsRKmtEf2ZFDHntR3VPEzS1JoHLZI23X2EdFffY/+qs XkOjRKN5AGzKCgZrWInKgovw3Agh4O+u7p1kcqBhVU91w1TqDvT8sYSbmrc88SvwfQK1 RIbw== X-Received: by 10.112.160.170 with SMTP id xl10mr3359928lbb.40.1387188507208; Mon, 16 Dec 2013 02:08:27 -0800 (PST) Received: from localhost.localdomain (broadband-95-84-154-9.nationalcablenetworks.ru. [95.84.154.9]) by mx.google.com with ESMTPSA id qx1sm9027464lbb.15.2013.12.16.02.08.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2013 02:08:26 -0800 (PST) From: Antony Pavlov To: qemu-devel@nongnu.org Date: Mon, 16 Dec 2013 14:15:04 +0400 Message-Id: <1387188908-754-3-git-send-email-antonynpavlov@gmail.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1387188908-754-1-git-send-email-antonynpavlov@gmail.com> References: <1387188908-754-1-git-send-email-antonynpavlov@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22b Cc: Peter Maydell , Peter Crosthwaite , Antony Pavlov , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Subject: [Qemu-devel] [PATCH v10 2/6] hw/arm/digic: prepare DIGIC-based boards support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also this patch adds initial support for Canon PowerShot A1100 IS compact camera. Signed-off-by: Antony Pavlov --- hw/arm/Makefile.objs | 1 + hw/arm/digic_boards.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/qom-test.c | 1 + 3 files changed, 86 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..87a9c4b --- /dev/null +++ b/hw/arm/digic_boards.c @@ -0,0 +1,84 @@ +/* + * QEMU model of the Canon DIGIC boards (cameras indeed :). + * + * Copyright (C) 2013 Antony Pavlov + * + * 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 "qemu/error-report.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) { + error_report("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) diff --git a/tests/qom-test.c b/tests/qom-test.c index 499be40..f67f7c2 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -70,6 +70,7 @@ static const char *arm_machines[] = { "xilinx-zynq-a9", "highbank", "midway", + "canon-a1100", }; static const char *cris_machines[] = {