{"id":817914,"url":"http://patchwork.ozlabs.org/api/patches/817914/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-8-git-send-email-mark.cave-ayland@ilande.co.uk/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1506264466-28252-8-git-send-email-mark.cave-ayland@ilande.co.uk>","list_archive_url":null,"date":"2017-09-24T14:47:46","name":"[7/7] mac_dbdma: change DBDMA_kick to a MAC_DBDMA type method","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"21d5c24a7d7cbe62548db6e0402e8b483033b324","submitter":{"id":12451,"url":"http://patchwork.ozlabs.org/api/people/12451/?format=json","name":"Mark Cave-Ayland","email":"mark.cave-ayland@ilande.co.uk"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1506264466-28252-8-git-send-email-mark.cave-ayland@ilande.co.uk/mbox/","series":[{"id":4817,"url":"http://patchwork.ozlabs.org/api/series/4817/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4817","date":"2017-09-24T14:47:39","name":"mac_dbdma: tidy-up and QOMify","version":1,"mbox":"http://patchwork.ozlabs.org/series/4817/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/817914/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/817914/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y0Vbj1YyBz9sRW\n\tfor ;\n\tMon, 25 Sep 2017 00:54:07 +1000 (AEST)","from localhost ([::1]:38442 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dw8IF-0007Kf-2s\n\tfor incoming@patchwork.ozlabs.org; Sun, 24 Sep 2017 10:54:03 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57157)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dw8Cb-0002gw-M1\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dw8Ca-0002HK-IX\n\tfor qemu-devel@nongnu.org; Sun, 24 Sep 2017 10:48:13 -0400","from chuckie.co.uk ([82.165.15.123]:49780\n\thelo=s16892447.onlinehome-server.info)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dw8CW-0002Cu-FF; Sun, 24 Sep 2017 10:48:08 -0400","from host86-191-82-173.range86-191.btcentralplus.com\n\t([86.191.82.173] helo=kentang.home)\n\tby s16892447.onlinehome-server.info with esmtpsa\n\t(TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76)\n\t(envelope-from )\n\tid 1dw8CZ-0006gI-8O; Sun, 24 Sep 2017 15:48:12 +0100"],"From":"Mark Cave-Ayland ","To":"qemu-ppc@nongnu.org, qemu-devel@nongnu.org, david@gibson.dropbear.id.au","Date":"Sun, 24 Sep 2017 15:47:46 +0100","Message-Id":"<1506264466-28252-8-git-send-email-mark.cave-ayland@ilande.co.uk>","X-Mailer":"git-send-email 1.7.10.4","In-Reply-To":"<1506264466-28252-1-git-send-email-mark.cave-ayland@ilande.co.uk>","References":"<1506264466-28252-1-git-send-email-mark.cave-ayland@ilande.co.uk>","X-SA-Exim-Connect-IP":"86.191.82.173","X-SA-Exim-Mail-From":"mark.cave-ayland@ilande.co.uk","X-SA-Exim-Version":"4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000)","X-SA-Exim-Scanned":"Yes (on s16892447.onlinehome-server.info)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [fuzzy]","X-Received-From":"82.165.15.123","Subject":"[Qemu-devel] [PATCH 7/7] mac_dbdma: change DBDMA_kick to a\n\tMAC_DBDMA type method","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"With this we can now remove the last external method used to interface\nbetween macio and DBDMA.\n\nSigned-off-by: Mark Cave-Ayland \n---\n hw/ide/macio.c | 3 ++-\n hw/misc/macio/mac_dbdma.c | 19 ++++++++++---------\n include/hw/ppc/mac_dbdma.h | 4 +---\n 3 files changed, 13 insertions(+), 13 deletions(-)","diff":"diff --git a/hw/ide/macio.c b/hw/ide/macio.c\nindex b296017..6f7f286 100644\n--- a/hw/ide/macio.c\n+++ b/hw/ide/macio.c\n@@ -384,6 +384,7 @@ static void ide_dbdma_start(IDEDMA *dma, IDEState *s,\n BlockCompletionFunc *cb)\n {\n MACIOIDEState *m = container_of(dma, MACIOIDEState, dma);\n+ DBDMAState *dbdma = (DBDMAState *)m->dbdma;\n \n s->io_buffer_index = 0;\n if (s->drive_kind == IDE_CD) {\n@@ -399,7 +400,7 @@ static void ide_dbdma_start(IDEDMA *dma, IDEState *s,\n MACIO_DPRINTF(\"-------------------------\\n\");\n \n m->dma_active = true;\n- DBDMA_kick(m->dbdma);\n+ dbdma->kick(dbdma);\n }\n \n static const IDEDMAOps dbdma_ops = {\ndiff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c\nindex addb97d..f8375db 100644\n--- a/hw/misc/macio/mac_dbdma.c\n+++ b/hw/misc/macio/mac_dbdma.c\n@@ -301,6 +301,11 @@ wait:\n channel_run(ch);\n }\n \n+static void dbdma_kick(DBDMAState *dbdma)\n+{\n+ qemu_bh_schedule(dbdma->bh);\n+}\n+\n static void start_output(DBDMA_channel *ch, int key, uint32_t addr,\n uint16_t req_count, int is_last)\n {\n@@ -381,7 +386,7 @@ static void load_word(DBDMA_channel *ch, int key, uint32_t addr,\n next(ch);\n \n wait:\n- DBDMA_kick(dbdma_from_ch(ch));\n+ dbdma_kick(dbdma_from_ch(ch));\n }\n \n static void store_word(DBDMA_channel *ch, int key, uint32_t addr,\n@@ -413,7 +418,7 @@ static void store_word(DBDMA_channel *ch, int key, uint32_t addr,\n next(ch);\n \n wait:\n- DBDMA_kick(dbdma_from_ch(ch));\n+ dbdma_kick(dbdma_from_ch(ch));\n }\n \n static void nop(DBDMA_channel *ch)\n@@ -430,7 +435,7 @@ static void nop(DBDMA_channel *ch)\n conditional_branch(ch);\n \n wait:\n- DBDMA_kick(dbdma_from_ch(ch));\n+ dbdma_kick(dbdma_from_ch(ch));\n }\n \n static void stop(DBDMA_channel *ch)\n@@ -552,11 +557,6 @@ static void DBDMA_run_bh(void *opaque)\n DBDMA_DPRINTF(\"<- DBDMA_run_bh\\n\");\n }\n \n-void DBDMA_kick(DBDMAState *dbdma)\n-{\n- qemu_bh_schedule(dbdma->bh);\n-}\n-\n static void\n dbdma_register_channel(DBDMAState *s, int nchan, qemu_irq irq,\n DBDMA_rw rw, DBDMA_flush flush, void *opaque)\n@@ -686,7 +686,7 @@ static void dbdma_control_write(DBDMA_channel *ch)\n \n /* If active, make sure the BH gets to run */\n if (status & ACTIVE) {\n- DBDMA_kick(dbdma_from_ch(ch));\n+ dbdma_kick(dbdma_from_ch(ch));\n }\n }\n \n@@ -904,6 +904,7 @@ static void mac_dbdma_init(Object *obj)\n sysbus_init_mmio(sbd, &s->mem);\n \n s->register_channel = dbdma_register_channel;\n+ s->kick = dbdma_kick;\n }\n \n static void mac_dbdma_realize(DeviceState *dev, Error **errp)\ndiff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h\nindex d6a38c5..a30f8d8 100644\n--- a/include/hw/ppc/mac_dbdma.h\n+++ b/include/hw/ppc/mac_dbdma.h\n@@ -169,11 +169,9 @@ typedef struct DBDMAState {\n \n void (*register_channel)(struct DBDMAState *s, int nchan, qemu_irq irq,\n DBDMA_rw rw, DBDMA_flush flush, void *opaque);\n+ void (*kick)(struct DBDMAState *s);\n } DBDMAState;\n \n-/* Externally callable functions */\n-void DBDMA_kick(DBDMAState *dbdma);\n-\n #define TYPE_MAC_DBDMA \"mac-dbdma\"\n #define MAC_DBDMA(obj) OBJECT_CHECK(DBDMAState, (obj), TYPE_MAC_DBDMA)\n \n","prefixes":["7/7"]}