From nobody Tue Feb 10 19:17:29 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1593163744; cv=none; d=zohomail.com; s=zohoarc; b=HaWb8ePWbc6pGwhnsJeLJo60UzTSWS4EmxhsXruwpIc05qjY2lr/ccHxgUTrS0HkJER/yOuzCr2Uru25ulWWghfPYQ5viFWXrQbnhDzyP/3+NuwHui6htWeFHMt5Vt3qCrj8MwTg8dLs0nZqquwpNJN3TCpIex87b6jkWfbqWBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593163744; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I63KsFJD1Yc/EOHI+PxISX/XfMt/r8FmmuQ30HKa/EU=; b=TwPJal2IFR1c+wyT0ioCmnCLU4VFjPLhBzgSrbMsXQ7iC+xJapFAcEFmfNYJjpCrnhYiW3jmFf47k7ZIHPJMn7ER3Jq8Gjo5lZHW5OSe3p8uXg6ZAdXXH4LF8Oq/tt2vzSRoYwCdw/zCLq4On5JUj1TXXFLyzDRpbVR0DMIvVcY= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593163744018585.7431909883745; Fri, 26 Jun 2020 02:29:04 -0700 (PDT) Received: from localhost ([::1]:60838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jokfO-000528-Qr for importer@patchew.org; Fri, 26 Jun 2020 05:29:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jokbA-0005KM-J8; Fri, 26 Jun 2020 05:24:40 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:34310 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jokb8-00051Q-QK; Fri, 26 Jun 2020 05:24:40 -0400 Received: from host86-158-109-79.range86-158.btcentralplus.com ([86.158.109.79] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jokb6-0007bz-NQ; Fri, 26 Jun 2020 10:24:41 +0100 From: Mark Cave-Ayland To: peter.maydell@linaro.org, laurent@vivier.eu, david@gibson.dropbear.id.au, qemu-devel@nongnu.org, qemu-ppc@nongnu.org Date: Fri, 26 Jun 2020 10:23:08 +0100 Message-Id: <20200626092317.3875-14-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200626092317.3875-1-mark.cave-ayland@ilande.co.uk> References: <20200626092317.3875-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.158.109.79 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 13/22] adb: add status field for holding information about the last ADB request X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Currently only 2 bits are defined: one to indicate if the request timed out= (no reply) and another to indicate whether the request was the result of an aut= opoll operation. Signed-off-by: Mark Cave-Ayland Tested-by: Finn Thain Acked-by: Laurent Vivier Message-Id: <20200623204936.24064-14-mark.cave-ayland@ilande.co.uk> --- hw/input/adb.c | 14 +++++++++++--- include/hw/input/adb.h | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index c1adb21e6b..a7a482fdfa 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -42,7 +42,7 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint= 8_t *buf, int len) { ADBDevice *d; ADBDeviceClass *adc; - int devaddr, cmd, i; + int devaddr, cmd, olen, i; =20 cmd =3D buf[0] & 0xf; if (cmd =3D=3D ADB_BUSRESET) { @@ -50,6 +50,7 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint= 8_t *buf, int len) d =3D s->devices[i]; adb_device_reset(d); } + s->status =3D 0; return 0; } =20 @@ -63,16 +64,22 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const ui= nt8_t *buf, int len) } } =20 + s->status =3D 0; devaddr =3D buf[0] >> 4; for (i =3D 0; i < s->nb_devices; i++) { d =3D s->devices[i]; adc =3D ADB_DEVICE_GET_CLASS(d); =20 if (d->devaddr =3D=3D devaddr) { - return adc->devreq(d, obuf, buf, len); + olen =3D adc->devreq(d, obuf, buf, len); + if (!olen) { + s->status |=3D ADB_STATUS_BUSTIMEOUT; + } + return olen; } } =20 + s->status |=3D ADB_STATUS_BUSTIMEOUT; return ADB_RET_NOTPRESENT; } =20 @@ -94,9 +101,10 @@ int adb_poll(ADBBusState *s, uint8_t *obuf, uint16_t po= ll_mask) olen =3D adb_request(s, obuf + 1, buf, 1); /* if there is data, we poll again the same device */ if (olen > 0) { + s->status |=3D ADB_STATUS_POLLREPLY; obuf[0] =3D buf[0]; olen++; - break; + return olen; } } s->poll_index++; diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h index f1bc358d8e..cff264739c 100644 --- a/include/hw/input/adb.h +++ b/include/hw/input/adb.h @@ -70,6 +70,9 @@ typedef struct ADBDeviceClass { #define TYPE_ADB_BUS "apple-desktop-bus" #define ADB_BUS(obj) OBJECT_CHECK(ADBBusState, (obj), TYPE_ADB_BUS) =20 +#define ADB_STATUS_BUSTIMEOUT 0x1 +#define ADB_STATUS_POLLREPLY 0x2 + struct ADBBusState { /*< private >*/ BusState parent_obj; @@ -79,6 +82,7 @@ struct ADBBusState { uint16_t pending; int nb_devices; int poll_index; + uint8_t status; =20 QEMUTimer *autopoll_timer; bool autopoll_enabled; --=20 2.20.1