From patchwork Sat Jan 23 20:40:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 8098061 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1CAE39F818 for ; Sat, 23 Jan 2016 20:44:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 638302034E for ; Sat, 23 Jan 2016 20:44:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 931CF2034C for ; Sat, 23 Jan 2016 20:44:40 +0000 (UTC) Received: from localhost ([::1]:58472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN531-0004ew-Vk for patchwork-qemu-devel@patchwork.kernel.org; Sat, 23 Jan 2016 15:44:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4zc-00067v-Og for qemu-devel@nongnu.org; Sat, 23 Jan 2016 15:41:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aN4za-0005SM-MJ for qemu-devel@nongnu.org; Sat, 23 Jan 2016 15:41:08 -0500 Received: from smtp5-g21.free.fr ([212.27.42.5]:19730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aN4za-0005SB-DS; Sat, 23 Jan 2016 15:41:06 -0500 Received: from localhost.localdomain (unknown [78.230.185.200]) by smtp5-g21.free.fr (Postfix) with ESMTP id D150CD48143; Sat, 23 Jan 2016 21:39:21 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sat, 23 Jan 2016 21:40:02 +0100 Message-Id: <1453581610-23179-6-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453581610-23179-1-git-send-email-hpoussin@reactos.org> References: <1453581610-23179-1-git-send-email-hpoussin@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.5 Cc: Mark Cave-Ayland , Alexander Graf , Alyssa Milburn , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 05/13] cuda: port SET_DEVICE_LIST command to new framework X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Take device list mask into account when polling ADB devices. Signed-off-by: Hervé Poussineau --- hw/input/adb.c | 18 ++++++++++-------- hw/misc/macio/cuda.c | 17 +++++++++++++++-- hw/ppc/mac.h | 1 + include/hw/input/adb.h | 2 +- roms/SLOF | 2 +- roms/openbios | 2 +- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/hw/input/adb.c b/hw/input/adb.c index 09eead9..d05fdfd 100644 --- a/hw/input/adb.c +++ b/hw/input/adb.c @@ -88,7 +88,7 @@ int adb_request(ADBBusState *s, uint8_t *obuf, const uint8_t *buf, int len) } /* XXX: move that to cuda ? */ -int adb_poll(ADBBusState *s, uint8_t *obuf) +int adb_poll(ADBBusState *s, uint8_t *obuf, uint16_t poll_mask) { ADBDevice *d; int olen, i; @@ -99,13 +99,15 @@ int adb_poll(ADBBusState *s, uint8_t *obuf) if (s->poll_index >= s->nb_devices) s->poll_index = 0; d = s->devices[s->poll_index]; - buf[0] = ADB_READREG | (d->devaddr << 4); - olen = adb_request(s, obuf + 1, buf, 1); - /* if there is data, we poll again the same device */ - if (olen > 0) { - obuf[0] = buf[0]; - olen++; - break; + if ((1 << d->devaddr) & poll_mask) { + buf[0] = ADB_READREG | (d->devaddr << 4); + olen = adb_request(s, obuf + 1, buf, 1); + /* if there is data, we poll again the same device */ + if (olen > 0) { + obuf[0] = buf[0]; + olen++; + break; + } } s->poll_index++; } diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 9ec642f..9af8e1d 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -522,7 +522,7 @@ static void cuda_adb_poll(void *opaque) uint8_t obuf[ADB_MAX_OUT_LEN + 2]; int olen; - olen = adb_poll(&s->adb_bus, obuf + 2); + olen = adb_poll(&s->adb_bus, obuf + 2, s->poll_mask); if (olen > 0) { obuf[0] = ADB_PACKET; obuf[1] = 0x40; /* polled data */ @@ -589,9 +589,22 @@ static bool cuda_cmd_set_autorate(CUDAState *s, return true; } +static bool cuda_cmd_set_device_list(CUDAState *s, + const uint8_t *in_data, int in_len, + uint8_t *out_data, int *out_len) +{ + if (in_len != 2) { + return false; + } + + s->poll_mask = (((uint16_t)in_data[0]) << 8) | in_data[1]; + return true; +} + static const CudaCommand handlers[] = { { CUDA_AUTOPOLL, "AUTOPOLL", cuda_cmd_autopoll }, { CUDA_SET_AUTO_RATE, "SET_AUTO_RATE", cuda_cmd_set_autorate }, + { CUDA_SET_DEVICE_LIST, "SET_DEVICE_LIST", cuda_cmd_set_device_list }, }; static void cuda_receive_packet(CUDAState *s, @@ -640,7 +653,6 @@ static void cuda_receive_packet(CUDAState *s, cuda_send_packet_to_host(s, obuf, 7); return; case CUDA_FILE_SERVER_FLAG: - case CUDA_SET_DEVICE_LIST: case CUDA_SET_POWER_MESSAGES: cuda_send_packet_to_host(s, obuf, 3); return; @@ -847,6 +859,7 @@ static void cuda_realizefn(DeviceState *dev, Error **errp) s->adb_poll_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_adb_poll, s); s->auto_rate_ms = 20; + s->poll_mask = 0xffff; } static void cuda_initfn(Object *obj) diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index 90fcb69..506f7a8 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -111,6 +111,7 @@ typedef struct CUDAState { int data_out_index; qemu_irq irq; + uint16_t poll_mask; uint8_t auto_rate_ms; uint8_t autopoll; uint8_t data_in[128]; diff --git a/include/hw/input/adb.h b/include/hw/input/adb.h index bdfccd4..db51d03 100644 --- a/include/hw/input/adb.h +++ b/include/hw/input/adb.h @@ -79,7 +79,7 @@ struct ADBBusState { int adb_request(ADBBusState *s, uint8_t *buf_out, const uint8_t *buf, int len); -int adb_poll(ADBBusState *s, uint8_t *buf_out); +int adb_poll(ADBBusState *s, uint8_t *buf_out, uint16_t poll_mask); #define TYPE_ADB_KEYBOARD "adb-keyboard" #define TYPE_ADB_MOUSE "adb-mouse" diff --git a/roms/SLOF b/roms/SLOF index b4c9380..811277a 160000 --- a/roms/SLOF +++ b/roms/SLOF @@ -1 +1 @@ -Subproject commit b4c93802a5b2c72f096649c497ec9ff5708e4456 +Subproject commit 811277ac91f674a9273e2b529791e9b75350f3e8 diff --git a/roms/openbios b/roms/openbios index 3caee17..18f02b1 160000 --- a/roms/openbios +++ b/roms/openbios @@ -1 +1 @@ -Subproject commit 3caee1794ac3f742315823d8447d21f33ce019e9 +Subproject commit 18f02b14de795c1aab4fe23c1810bfd0944da6aa