From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F49CC433F5 for ; Mon, 20 Sep 2021 06:46:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26A9E6101C for ; Mon, 20 Sep 2021 06:46:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 26A9E6101C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:52018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mSD4N-0007uY-87 for qemu-devel@archiver.kernel.org; Mon, 20 Sep 2021 02:46:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mSCz9-0001T1-VD for qemu-devel@nongnu.org; Mon, 20 Sep 2021 02:41:03 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43523) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mSCz7-0004RJ-8I for qemu-devel@nongnu.org; Mon, 20 Sep 2021 02:41:03 -0400 Received: by mail-wr1-x435.google.com with SMTP id w17so18721300wrv.10 for ; Sun, 19 Sep 2021 23:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EcOr1QmO1S16fr4fOEvRxqFLTXjTaCedzwKUta20dVg=; b=M645RUxHr+fjF2Oxsz/54Ni4G92bdFpLctuYWDoWcga4O5B76pSfRxpvYbCDSLhMlJ tTjJKAbAmWsCTUy58U+ONZwZoAt1/N82LgH7HDaz27mzxS3vWER63NLHakbdfPwjs3vn fWc0S5pHC7EjoUBiR/zgUw9D/VWpEl3/419xfMnNBFylWseSx/nlRM7j1Feq+9XzLsGJ F6R26pBOlrqpHHG8EBrK9XKoU/vhE2jiF2nD7xacBHMNGxRMe0J/nEW7JsD72c7QkCer FBHDMrTmzSqHRMXFocdvQPdxOo7MHVPs4/3vs8AxaVa8r1g/eE95FwPKbHvYg7rNGY1Q nyvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EcOr1QmO1S16fr4fOEvRxqFLTXjTaCedzwKUta20dVg=; b=hj19jhVuMitXylQgwBbhnawYfqJJYH2B4XVrXi6G7KtAi9zfW0a0kquL1GQXW4uwwO kv3wDDyBj3bMlzobT656bBuVOrCS3iTKJpC5ZE+rilwOw56M/qBW+sSIe04lQssrVRD2 XNV9Z65CBRoPWdGQfO4VtXjnFkSybp9xJv2OCU9JMu9NWR7uFYtsJLa1DCkBnI9YUSMB yGabBU4RUGymJ0Gruc2LWchZ3HUyFBOHFWgfsbW0+Le8C1JFR+TdM5JuKHWoeJCbJRs5 gFN1aibHmtf1TQKAZ3F8U8s9FvfHoxGc2nDclI+fe6Eet/cz4LvejBnAlHy2LS5VkmAq 59Ig== X-Gm-Message-State: AOAM532UC+w3c6WMkaWN8L+TK8ln+PSt847ZhTGM+TKXjsK7Pf+L6E0M aCNGGmTI7THgtvLjmD/QgDx7gigBQrE= X-Google-Smtp-Source: ABdhPJyD5RuJN634Qj2x9308noTh5esQTBBXGuRJCttvftLoiBuTZJJx1XXeaofD8AGOY4KgTugYQw== X-Received: by 2002:adf:d1c5:: with SMTP id b5mr9563327wrd.252.1632120059828; Sun, 19 Sep 2021 23:40:59 -0700 (PDT) Received: from x1w.. (14.red-83-35-25.dynamicip.rima-tde.net. [83.35.25.14]) by smtp.gmail.com with ESMTPSA id g205sm11057803wmg.18.2021.09.19.23.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Sep 2021 23:40:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] hw/input/lasips2: Move LASIPS2State declaration to 'hw/input/lasips2.h' Date: Mon, 20 Sep 2021 08:40:47 +0200 Message-Id: <20210920064048.2729397-3-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920064048.2729397-1-f4bug@amsat.org> References: <20210920064048.2729397-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sven Schnelle , Helge Deller , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We want to use the OBJECT_DECLARE_SIMPLE_TYPE() macro to QOM'ify this device in the next commit. To make its review simpler, as a first step move the LASIPS2State and LASIPS2Port declarations to 'hw/input/lasips2.h' Signed-off-by: Philippe Mathieu-Daudé --- include/hw/input/lasips2.h | 18 ++++++++++++++++++ hw/input/lasips2.c | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/hw/input/lasips2.h b/include/hw/input/lasips2.h index 0cd7b59064a..c88f1700162 100644 --- a/include/hw/input/lasips2.h +++ b/include/hw/input/lasips2.h @@ -11,6 +11,24 @@ #define TYPE_LASIPS2 "lasips2" +struct LASIPS2State; +typedef struct LASIPS2Port { + struct LASIPS2State *parent; + MemoryRegion reg; + void *dev; + uint8_t id; + uint8_t control; + uint8_t buf; + bool loopback_rbne; + bool irq; +} LASIPS2Port; + +typedef struct LASIPS2State { + LASIPS2Port kbd; + LASIPS2Port mouse; + qemu_irq irq; +} LASIPS2State; + void lasips2_init(MemoryRegion *address_space, hwaddr base, qemu_irq irq); #endif /* HW_INPUT_LASIPS2_H */ diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index 68d741d3421..0f8362f17bc 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -33,24 +33,6 @@ #include "hw/irq.h" -struct LASIPS2State; -typedef struct LASIPS2Port { - struct LASIPS2State *parent; - MemoryRegion reg; - void *dev; - uint8_t id; - uint8_t control; - uint8_t buf; - bool loopback_rbne; - bool irq; -} LASIPS2Port; - -typedef struct LASIPS2State { - LASIPS2Port kbd; - LASIPS2Port mouse; - qemu_irq irq; -} LASIPS2State; - static const VMStateDescription vmstate_lasips2 = { .name = "lasips2", .version_id = 0, -- 2.31.1