From nobody Wed Apr 2 14:18:38 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1742751620; cv=none; d=zohomail.com; s=zohoarc; b=NrzAeXY93vyqaY3tBxtmumQvP61uiI0Et8wHHYjn0l/1gwR+8mYv3a1jmSXsqfph6dA6U5NiV/ds502fN93kGgLZA5KqhGgwbQSn6Raw1+xZIBZ5cTTENj3d0/nkThcZY9/1YF6W/jg+t9iKuT6JQYn7bpPKE/JCT9ZNUZfsnAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742751620; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3YwrBfdlhs0bOKiaJCFIoQFWS0HOXf48uYuIIHVmYZU=; b=IU4jx39SxxZJPLfX27dKlcRg6p3YWymQviMJ4B+HPo34uizKkInwa5Li0bLxMkA/n5sP6/IWs8OcR3dy0yZ/2tP7OmeCtO3/YwTR2GsjS2Ng1PaBf6YaMvaN/BcFbKeX3NFdTKl3pAaTilWMM4pTDFTJT74lfB+dARa72DYERTA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1742751619962896.1489643838556; Sun, 23 Mar 2025 10:40:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1twPGe-0005uZ-GM; Sun, 23 Mar 2025 13:37:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1twPGb-0005tE-UN for qemu-devel@nongnu.org; Sun, 23 Mar 2025 13:37:46 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1twPGa-0002vr-FQ for qemu-devel@nongnu.org; Sun, 23 Mar 2025 13:37:45 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-22398e09e39so70809985ad.3 for ; Sun, 23 Mar 2025 10:37:44 -0700 (PDT) Received: from stoup.. (174-21-74-48.tukw.qwest.net. [174.21.74.48]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22781209ff3sm54075165ad.257.2025.03.23.10.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Mar 2025 10:37:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742751463; x=1743356263; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3YwrBfdlhs0bOKiaJCFIoQFWS0HOXf48uYuIIHVmYZU=; b=e/VPuBzoxb+UjFwMs1qYY0FGYXzFQZB1geC6H9rHkjlaNFneSxKIMhozkPyneoNICo mYWYgyIBw2JIGV+jjRrKp6SDl4jxBPsx2D7J7UtA8hlCz/XmCiV0wCo5q+q/GClY+HUS v8DwcmeN0gSdu8XYSZjYZjtmZ3M/uion1+eUWqfqE/S2be2BKRfQS/yGm3rsd8wxBEyO akqzYIGQsK8XfvDXrpJfaxZkmyHJ4oOdvZcmUsnqfJFojANOl6OiUVPUrsOd8S/M/Mb5 8BF9f6hc6NJOIvUJTEVVaAO1USsWw5N13tIf9zHX+CFylF5CLTOQ70PLy7VpSXV98gfk /kIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742751463; x=1743356263; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3YwrBfdlhs0bOKiaJCFIoQFWS0HOXf48uYuIIHVmYZU=; b=FFEwXaQSZulz4Pf1kl+fCrDILH7t4sn029rbU3QGq1rSGA1ROTRf1xpP5HP52FdDX0 dSq6ndx88WglybKvZ6LgVSupBSzer+Ir1b4dWG/hAzwNOupJ9Ig75rfPVGwfAR9mCeIM Rdr4iCzxMtIXaR+qQ5U+lPrxyCRduacZAuIS/FZeQMDiHqVbfP5b5btb7RM/g42Czvjh mNHfjGmI4/rz9msrPnmOsC8i/CA2VEgwJsP6pywGgmU9tMV52vhRZMGa3Z2EMm1k4wOr Jq3P5qnGuH4lbdpStjpDhea66Ne+aGr5jF4Bwm31UoTZn4vfhbwkxGHXbClIeyUtFRJO OUvw== X-Gm-Message-State: AOJu0YwRfomXQCa/ecYktiNRggXqRUW53DvjF9kRHFofvMyzLc+TRkn2 d2DCa4YZ+1aC3lvCx06n0x3V2x55VvCZ553RSTGZbrzKMtmft+9UFz+wnrXHtfNzBpfpGrg+iov I X-Gm-Gg: ASbGncuqfTD1dzLrXLDDcEqfVw/dPs4irmNg7Ik12VMbg+YxxQRsODWGqHf8P4+J9SC dqmm625ZE+RQd/VYjTKfvldTVRYucIN8wd0GpFC8afOUe9Hl04qO8HN2LhG6ZsuDXUDKh4wl+1T V6hfmdBXVLaUzVsLanuo7IT48gYq0d4mW9pax7/DXaNVPpX+H9QTxXodkU/6a4OFsDzR0qGan2V VjkxbJac3xwiQg2GMl4jaX9KVXpSE5rRlpgCVSHOrgL9ITVVlZg34ef/6Cq445i0A3AU+IGbsOv wvdII8UQWjpjDXpc+ETGpsBsOL/iFHxFCghg2U+yVzfOfOJz6y5aCC41DVE5h+u24Q/fOu36cab 3 X-Google-Smtp-Source: AGHT+IE3LQU+yoQQmB6CpDVl/ZEpqmAOalsnE1/3HPyLTd8o9Org15gCW/f4UA6JkyuFQs8uyNoSsg== X-Received: by 2002:a17:902:dad2:b0:223:2361:e855 with SMTP id d9443c01a7336-22780e17b3amr161552435ad.39.1742751463093; Sun, 23 Mar 2025 10:37:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mrolnik@gmail.com, philmd@linaro.org, pierrick.bouvier@linaro.org Subject: [PATCH 16/17] hw/avr: Move AtmegaMcuClass to atmega.h Date: Sun, 23 Mar 2025 10:37:28 -0700 Message-ID: <20250323173730.3213964-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250323173730.3213964-1-richard.henderson@linaro.org> References: <20250323173730.3213964-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1742751620951116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- hw/avr/atmega.h | 20 ++++++++++++++++++++ hw/avr/atmega.c | 22 +--------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/hw/avr/atmega.h b/hw/avr/atmega.h index a99ee15c7e..f031e6c10a 100644 --- a/hw/avr/atmega.h +++ b/hw/avr/atmega.h @@ -23,6 +23,10 @@ #define TYPE_ATMEGA1280_MCU "ATmega1280" #define TYPE_ATMEGA2560_MCU "ATmega2560" =20 +typedef struct AtmegaMcuClass AtmegaMcuClass; +DECLARE_CLASS_CHECKERS(AtmegaMcuClass, ATMEGA_MCU, + TYPE_ATMEGA_MCU) + typedef struct AtmegaMcuState AtmegaMcuState; DECLARE_INSTANCE_CHECKER(AtmegaMcuState, ATMEGA_MCU, TYPE_ATMEGA_MCU) @@ -32,6 +36,22 @@ DECLARE_INSTANCE_CHECKER(AtmegaMcuState, ATMEGA_MCU, #define TIMER_MAX 6 #define GPIO_MAX 12 =20 +struct AtmegaMcuClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + const char *uc_name; + const char *cpu_type; + size_t flash_size; + size_t eeprom_size; + size_t sram_size; + size_t io_size; + size_t gpio_count; + size_t adc_count; + const uint8_t *irq; + const struct peripheral_cfg *dev; +}; + struct AtmegaMcuState { /*< private >*/ SysBusDevice parent_obj; diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c index d4fc9c4aee..96e36743bc 100644 --- a/hw/avr/atmega.c +++ b/hw/avr/atmega.c @@ -36,7 +36,7 @@ enum AtmegaPeripheral { #define TIMER(n) (n + TIMER0) #define POWER(n) (n + POWER0) =20 -typedef struct { +typedef struct peripheral_cfg { uint16_t addr; enum AtmegaPeripheral power_index; uint8_t power_bit; @@ -46,26 +46,6 @@ typedef struct { bool is_timer16; } peripheral_cfg; =20 -struct AtmegaMcuClass { - /*< private >*/ - SysBusDeviceClass parent_class; - /*< public >*/ - const char *uc_name; - const char *cpu_type; - size_t flash_size; - size_t eeprom_size; - size_t sram_size; - size_t io_size; - size_t gpio_count; - size_t adc_count; - const uint8_t *irq; - const peripheral_cfg *dev; -}; -typedef struct AtmegaMcuClass AtmegaMcuClass; - -DECLARE_CLASS_CHECKERS(AtmegaMcuClass, ATMEGA_MCU, - TYPE_ATMEGA_MCU) - static const peripheral_cfg dev168_328[PERIFMAX] =3D { [USART0] =3D { 0xc0, POWER0, 1 }, [TIMER2] =3D { 0xb0, POWER0, 6, 0x70, 0x37, false }, --=20 2.43.0