From patchwork Fri Mar 26 16:06:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 48664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 09160B7CF0 for ; Sat, 27 Mar 2010 03:50:57 +1100 (EST) Received: from localhost ([127.0.0.1]:34252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NvCkI-00056n-1d for incoming@patchwork.ozlabs.org; Fri, 26 Mar 2010 12:50:54 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NvC5F-0003yw-4W for qemu-devel@nongnu.org; Fri, 26 Mar 2010 12:08:29 -0400 Received: from [140.186.70.92] (port=41685 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NvC4e-0003hH-M3 for qemu-devel@nongnu.org; Fri, 26 Mar 2010 12:08:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NvC4F-0006vM-4x for qemu-devel@nongnu.org; Fri, 26 Mar 2010 12:07:38 -0400 Received: from afflict.kos.to ([92.243.29.197]:33630) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NvC4B-0006tN-DT for qemu-devel@nongnu.org; Fri, 26 Mar 2010 12:07:23 -0400 Received: by afflict.kos.to (Postfix, from userid 1000) id 5A7EB265C4; Fri, 26 Mar 2010 16:07:23 +0000 (UTC) From: Riku Voipio To: qemu-devel@nongnu.org Date: Fri, 26 Mar 2010 16:06:48 +0000 Message-Id: X-Mailer: git-send-email 1.6.5 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Riku Voipio , =?UTF-8?q?Juha=20Riihim=C3=A4ki?= Subject: [Qemu-devel] [PATCH 28/48] prepare smc driver support for omap X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Riku Voipio Signed-Off-By: Riku Voipio Signed-Off-By: Juha Riihimäki --- hw/devices.h | 5 ++++- hw/smc91c111.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletions(-) diff --git a/hw/devices.h b/hw/devices.h index e9e8ec7..b4c10c5 100644 --- a/hw/devices.h +++ b/hw/devices.h @@ -5,6 +5,8 @@ /* smc91c111.c */ void smc91c111_init(NICInfo *, uint32_t, qemu_irq); +void *smc91c111_init_lite(NICInfo *, qemu_irq); +int smc91c111_iomemtype(void *opaque); /* lan9118.c */ void lan9118_init(NICInfo *, uint32_t, qemu_irq); @@ -21,7 +23,8 @@ void tsc210x_key_event(uWireSlave *chip, int key, int down); /* tsc2005.c */ void *tsc2005_init(qemu_irq pintdav); uint32_t tsc2005_txrx(void *opaque, uint32_t value, int len); -void tsc2005_set_transform(void *opaque, MouseTransformInfo *info); +void tsc2005_set_transform(void *opaque, MouseTransformInfo *info, + int z1_cons, int z2_cons); /* stellaris_input.c */ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); diff --git a/hw/smc91c111.c b/hw/smc91c111.c index c1a88c9..5d81d95 100644 --- a/hw/smc91c111.c +++ b/hw/smc91c111.c @@ -717,6 +717,7 @@ static int smc91c111_init1(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); + qemu_register_reset((void *)smc91c111_reset, s); smc91c111_reset(s); s->nic = qemu_new_nic(&net_smc91c111_info, &s->conf, @@ -757,4 +758,25 @@ void smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq) sysbus_connect_irq(s, 0, irq); } +void *smc91c111_init_lite(NICInfo *nd, qemu_irq irq) +{ + DeviceState *dev; + SysBusDevice *s; + + qemu_check_nic_model(nd, "smc91c111"); + dev = qdev_create(NULL, "smc91c111"); + qdev_set_nic_properties(dev, nd); + qdev_init_nofail(dev); + s = sysbus_from_qdev(dev); + //sysbus_mmio_map(s, 0, base); + sysbus_connect_irq(s, 0, irq); + return s; +} + +int smc91c111_iomemtype(void *opaque) +{ + SysBusDevice *s = (SysBusDevice *)opaque; + return (FROM_SYSBUS(smc91c111_state, s))->mmio_index; +} + device_init(smc91c111_register_devices)