From nobody Tue Feb 10 09:28:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) client-ip=209.85.221.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635613637; cv=none; d=zohomail.com; s=zohoarc; b=PklpyxHmSskh78JueZ2GCatY1PWa1CAjEype0Kb+UJMM5cCHRCumEEiCAhiLMxstKUThFHQuPJp67x7vurUp4PQnZUIVTGLLY/q0uyyBurIZ897/3Kx/xTNcgQ50WH8Wb+MHqZ8h2XNfAppprQfZZ1xB62VBnUYacmvcgs9C/6s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635613637; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eN5tS9IUiRPYlknYxxUSsbKuotBv9kfi9TXt8NixlX0=; b=NzZQJW7rMfBgB3zzcm5GgZB0lBbywGl+QI29VVjs2+kyri265wSqyLzAKy9x/IsfOC9VncG9T2ETr0LYhPxAGuNmptmu3/qBXGsMuLeVJvsGsvlF/89Ogp0CuAfYNVnuUa2PFzrUeR5i9lqaVjUNfxfPy/mdErCG1gtbTXbb260= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mx.zohomail.com with SMTPS id 1635613637118912.6493773749615; Sat, 30 Oct 2021 10:07:17 -0700 (PDT) Received: by mail-wr1-f53.google.com with SMTP id m22so21720409wrb.0 for ; Sat, 30 Oct 2021 10:07:16 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id v7sm8655552wrq.25.2021.10.30.10.07.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:07:15 -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=eN5tS9IUiRPYlknYxxUSsbKuotBv9kfi9TXt8NixlX0=; b=B4gqrIhEFrq6DkSIVOgzCbwwf1Nwd0DAqy96M7kSgnb5rt8z7cL3mTN/3NF2sxs1in O0YOpvEX0xelouTS6q/sHxk5va4/I2xvwVP12V/O5k+T9GZm+bgSxU4itXtHARSVc1YV 7HjWH3uFFYtRwOZOPOnnLGmnny5apBCNlj0WscrjZG7+CUNb5rrFN2Nu6xdIYf8NEWTj rjBYaZo/spry/y7qLwcYFUzBUl8L+fiXpPmEw5jV+DhNpC3c4QJdiBG5gh0OSuXicqDy coHQ792AO9JUQBsiVcYrMMvx+n7cww2tzm2nLHnVWvCYNpxk+e/gXmHrQj0XEyOsZpTm JznQ== 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=eN5tS9IUiRPYlknYxxUSsbKuotBv9kfi9TXt8NixlX0=; b=cGkia6oVQ54BA4yViqFub9dgRdMQmwi4lsIsvqVR4rQTeu/XRwK5oleQrS/BlZqwXG 3sxeso176lf+92qlb7RPtH6Ko+crN+EFTWDNbzBz7trr+NqmA/zEzw/pSzqDeEzGWIhX m9sB/NrUtKudg0SakY76bKClspVM7l7MbHXRSH70ceP/o+0QHy8nInZr3lh8ZDPMnwBa iodE266K15LEUOPUN1NM1hiAQVWPDZ8bP96Om19gyFtWbgo8CtlHEIGmErctNKewVivT WOBzDa0mIz/CSvWca/mEh0A+o1CnxGWKWh0J4ykdxfAts5oLc8+VIvc2VXc5ffZSSv3T 0kIw== X-Gm-Message-State: AOAM532Y4KiHmC2BwRYY6n0EdO0mJfR6xGz5Hnu9SSAPRpQUzLV7Q94l R98ggQ1EkksDLFxq+YJcDiM= X-Google-Smtp-Source: ABdhPJwVDj6rCTtxCCsT/hsccG2meoegZw7dchhcA7fG4S1yo4VOpc4S8QDSCwN87oTC0pMTBEwrIA== X-Received: by 2002:a5d:460d:: with SMTP id t13mr20400699wrq.44.1635613635441; Sat, 30 Oct 2021 10:07:15 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Yoshinori Sato , Magnus Damm , Paolo Bonzini , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 12/30] hw/char/sh_serial: Split off sh_serial_reset() from sh_serial_init() Date: Sat, 30 Oct 2021 19:05:57 +0200 Message-Id: <20211030170615.2636436-13-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211030170615.2636436-1-f4bug@amsat.org> References: <20211030170615.2636436-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1635613637951100001 From: BALATON Zoltan Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/char/sh_serial.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c index 5ee93dc732a..80a548d19d9 100644 --- a/hw/char/sh_serial.c +++ b/hw/char/sh_serial.c @@ -381,6 +381,25 @@ static const MemoryRegionOps sh_serial_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 +static void sh_serial_reset(SHSerialState *s) +{ + s->flags =3D SH_SERIAL_FLAG_TEND | SH_SERIAL_FLAG_TDE; + s->rtrg =3D 1; + + s->smr =3D 0; + s->brr =3D 0xff; + s->scr =3D 1 << 5; /* pretend that TX is enabled so early printk works= */ + s->sptr =3D 0; + + if (s->feat & SH_SERIAL_FEAT_SCIF) { + s->fcr =3D 0; + } else { + s->dr =3D 0xff; + } + + sh_serial_clear_fifo(s); +} + void sh_serial_init(MemoryRegion *sysmem, hwaddr base, int feat, uint32_t freq, Chardev *chr, @@ -393,21 +412,7 @@ void sh_serial_init(MemoryRegion *sysmem, SHSerialState *s =3D g_malloc0(sizeof(*s)); =20 s->feat =3D feat; - s->flags =3D SH_SERIAL_FLAG_TEND | SH_SERIAL_FLAG_TDE; - s->rtrg =3D 1; - - s->smr =3D 0; - s->brr =3D 0xff; - s->scr =3D 1 << 5; /* pretend that TX is enabled so early printk works= */ - s->sptr =3D 0; - - if (feat & SH_SERIAL_FEAT_SCIF) { - s->fcr =3D 0; - } else { - s->dr =3D 0xff; - } - - sh_serial_clear_fifo(s); + sh_serial_reset(s); =20 memory_region_init_io(&s->iomem, NULL, &sh_serial_ops, s, "serial", 0x100000000ULL); --=20 2.31.1