From patchwork Wed Oct 7 21:33:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 527430 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:4830:134:3::10]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BFFC014010F for ; Thu, 8 Oct 2015 08:52:09 +1100 (AEDT) Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zjwbz-0001GQ-Al for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2015 17:52:05 -0400 Received: from lists.gnu.org ([2001:4830:134:3::11]:59581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjwOW-00047y-4a for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2015 17:37:04 -0400 Received: from localhost ([::1]:59571 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjwOA-0004qJ-7C for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2015 17:36:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjwNE-0003SD-HT for qemu-devel@nongnu.org; Wed, 07 Oct 2015 17:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjwNA-0008DJ-4Z for qemu-devel@nongnu.org; Wed, 07 Oct 2015 17:35:44 -0400 Received: from mail-bl2on0067.outbound.protection.outlook.com ([65.55.169.67]:7872 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjwN9-0008Cx-Lo for qemu-devel@nongnu.org; Wed, 07 Oct 2015 17:35:40 -0400 Received: from BY2FFO11OLC013.protection.gbl (10.1.14.34) by BY2FFO11HUB044.protection.gbl (10.1.15.225) with Microsoft SMTP Server (TLS) id 15.1.286.14; Wed, 7 Oct 2015 21:35:37 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none; gmail.com; dmarc=none action=none header.from=xilinx.com; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BY2FFO11OLC013.mail.protection.outlook.com (10.1.15.25) with Microsoft SMTP Server (TLS) id 15.1.293.9 via Frontend Transport; Wed, 7 Oct 2015 21:35:35 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:37698 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1ZjwN4-0003R5-Mq; Wed, 07 Oct 2015 14:35:34 -0700 Received: from [127.0.0.1] (port=44420 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1ZjwN4-0000xi-IS; Wed, 07 Oct 2015 14:35:34 -0700 Received: from xsj-tvapsmtp02 (smtptest.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id t97LUadS016098; Wed, 7 Oct 2015 14:30:36 -0700 Received: from [172.19.74.182] (port=35346 helo=xsjalistai50.xlnx.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1ZjwN3-0000xf-Kp; Wed, 07 Oct 2015 14:35:33 -0700 From: Alistair Francis To: Date: Wed, 7 Oct 2015 14:33:55 -0700 Message-ID: <9ab909daee133f28276374e7e7dd04a05726df0c.1444251567.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21864.004 X-TM-AS-Result: No--10.348-7.0-31-10 X-imss-scan-details: No--10.348-7.0-31-10 X-TMASE-MatchedRID: 88fsL85hCHMg/QyJjyy5Gz9B1SHosSXQN25XIDQLt3bfUZT83lbkEMkN hiMflNUbHqg9vf3pZnuD4wYp4x07GoBm+npo1QC2/4ToWehCRQWuiRuR9mCaumL2dfjbFyVXJst K1NXQZJcezXDyBkGT+fNVdLOcUfYoGs5li5ONWllQiFNNqFvt1Zv8tNLRPUrWfmHrLgoJIly1Zk xSVV8uUO8BsGvUbOXxMkiWYsDskLavvxILmKK/HBRFJJyf5BJe3QfwsVk0UbtuRXh7bFKB7p6gY VKqbd9R7YrP452WRaxPbiXoD1AGOAyjdweGWuQKPpCuffGH9zI= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC013; 1:d8p0oWXQVNV+LL+YuO49JXtAYUSYTI9OWNnzox+VGGRpXMEgs1KryAd9FMmjvrvItLcLVW2ma7GtDcUymP4LxexREfSUzqVQnSHWL5lOUpEDOclC2z5eVljb4eZ95kUVBM8RTcmj1lRY0mUlq/doQ8OawqNpsu6uJGTJpsOrir/lXtedQ4Hn/Cdl8LZZ1yDCJBvC93Kx8ugXyMyIvHUyPHSrxqsFt/GRpuvYT5eB0hiy+A2QtUDIxYF1H8aDeMkawftSxWE4HqE39hhqIA0lNPsMiUK6LT1INgajSOds+WWIhpQ/97Ffqyakcxqcop8aUsyRH35NhXwG7qHCDIXdSP1moYYdoeIYnqTJuLPdzbvObaSrQ102eYQIwrNTV3L+7aQQJ//SD5jd4gsQVBBGng== X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(5003600100002)(50466002)(189998001)(19580395003)(71366001)(46102003)(5001960100002)(19580405001)(575784001)(33646002)(86362001)(106466001)(2351001)(229853001)(5007970100001)(118296001)(50986999)(92566002)(2950100001)(110136002)(5008740100001)(64706001)(105606002)(87936001)(47776003)(48376002)(64026002)(6806005)(85426001)(11100500001)(76176999)(77096005)(50226001)(81156007)(36756003)(5003940100001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB044; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; PTR:unknown-60-96.xilinx.com; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB044; 2:tOUbGujmdMRMpp6+S5Xyuw+wrqX+oRu9DXX9dfHzyzMB7Y/eLZuGMyyKQ54R1qC8zx7HhyukzCyA5R72lKupNNSsAFpIhI3ThncACWbR8T5H5j1bQ25oR0+y5k2womVGyBoY3f7D1IqJQjI+67o70nfXUpXRoFcvUMwfX9spn1A=; 3:9HWRNINzDvYIaC3YxjkIfQ2/RQEQp2xxvQ0G/L2tbVg/mkdw5mXfh24sKlooTkL7ZFbLWk4I01KPF0Wl+qkyDsSI8U4l7cN+PCupqlpOukxWQYTlUN3/aq0/zP98VbK05JI8rnadl/XdYKz1E/sHPFHAAdzZ5CjcOlQv4l855Vqy7ARvdmWIt5pfIPXhqgiOPpwvoqh25keTyU1vvCSsUp7TCnA6QLLqfhG0f9dCids=; 25:8dkKA2vgck61ZyTIIAVwLPlKFTCetud60qIs+pwRVRziCsP8LuTgdeNIbZnP0kXE6jiNaWvCpuxMxt45+EyZiamvL0JQodMtfhThLTRLkgRnLqfpt9b3oYwR7XTDm77wU8oHP7WrFJnKahstbeioXGAGp4fvsUEgcPIs5sGDhVMfRWBKA0ru6ze90qIEF5SA2Lc6dVcJqb1qgpG22l8gOULPp2NoPzacl2kkb7ccKLqtZPy/luJ3DaSwXILsGR8HJIyIUMB7BgDuqXJSPTFOnA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB044; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB044; 20:KhP4REbbit7X7jUAfqqnUhczIWKx6QQ/iuv/2jcH7er8qecMzi3/9ncmE9ZjXeAbYpHAAfQi27BXggwrqka17H18Zc7MtqFAUylo9CvX9NatMzLWUf5LFc5n8jMr3+wqYuiJujdaD0rANioYtEBfie6cq9I/NYmPCf6bMbmIsApdFCKiKhePf6Ts+op8Ge/MfA5fbI17eVYJYbvI4gPFf8LY3OwlrXnRVQ/C356OcXBCVh19B8x5LmJ78vDJHQcZ+XHYhoCIHkZqQVHFmvG7mG+mDv9MMPGxZQYY4Sx1LnRLwq/JVXYCXbxcaIAI5WHxesEjsHMDr5EnDk5jlu4F4hRy3eDgiOOJfXxsNCHTdDYoVRiJim+kiGaTWttD17BMLewNj0SElriCURBJztKVYdJip/qzgv4PFRMoVKG4OhaQTb4ZV5+tEsHFz51ILpdIVWm2PwddF8QiwFMOhs6M9cmT6yE6KYC1o0Asjd5x3LoNbEKgGN4kiUz984qrQZYc; 4:snPZef6S2F5Bst+/E37oYdWmDDFYEql6dkgCtIL6nm9++qd7Zl4fhQaLr/S8kKQ2d1wpdQCle7+6Eqlex4XaZYrq4W8jLiQiqodD/SRky/GSZ6yxF+t4KyjHRD1tLukc+3zxvm5nvj3lwVf6IyVLOlLPwZiVaE5a62uMEAYWZP96q1x+vslilU2ZHpTxbNwBiRwZdxEPtaNAwF0zTBCMCGLcDHjdeiOCo3fYrJpOdGdVntCfqoznpo2qpO0+EY2q15MHj64EKs9UikHzN/k/vLtxWr/9JPLJ3vNLBnZhdpYs+21rlMTj/SBvIBnjQeeUTQZC6g//JRkt1x02VvzV1K/ObRCwNQEgm/fCVZlsgp+74AuD2TU9o20yMsuMt7kc X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(3002001)(10115024); SRVR:BY2FFO11HUB044; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB044; X-Forefront-PRVS: 0722981D2A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11HUB044; 23:/aWKMmzuR8iipqT+sVtRp1qkvfDvXw8r6r7PP8Qs?= =?us-ascii?Q?SmbI7oN7z/lhW0fNwv7JMuNCepmakS+nOBYhwANGv/FITtsIY39Z2Qmq5IHl?= =?us-ascii?Q?beIeJGmmgEsrlAwoOOemjoBNBR41ZSbm8hFt2ZaRXCZzqqmOAq+FN7FBK7Xr?= =?us-ascii?Q?FmSl0Z6JcejsBXgT1xeeRxPcYWFMJrbR7oSjDR+ORZgpIg3UqZpxRQuy2f3y?= =?us-ascii?Q?bGe6mMOhdSK8r0AekB66UVV66jCHiTQZG59wvKxKksM0/zXfIGaAX8Iqw2DY?= =?us-ascii?Q?Ice6fodyhOEKNz0axxIuqbvxrsJhMe3O6rxAvHc73Xcm70tnreYxee7tITQC?= =?us-ascii?Q?r0Ru2tdlUGDQukmbpc6YajTPBHzl8hMevO2lAlRnxX4M+zNpu9/Z2JxcmmRM?= =?us-ascii?Q?QceaKIkXqAmyP3A2dlKCosUtN0I9FMTq+viZoSRKVNzj8xYFc4S/jrjTDdvE?= =?us-ascii?Q?dcO9ca3EVd2Z9JznQoh3DpjLjOCgfAc/Epywrb66MkT6WLiYaOpRsBo49YmF?= =?us-ascii?Q?vTSKNxPWxjkMvhVUcptvXiUxzcpFdYThqcOChKpubPvijW394Y+Hs0FbiC0P?= =?us-ascii?Q?xLiqE5K6FvN1xqoHWdOnvlyvkvJYXZYpsMJeWscI0vF4juXFYppWz6jJrVqO?= =?us-ascii?Q?bU8fsVQlTC4b6fNgEEgeJCZAiNeHmh61Sb2jE6lTMB9ZD2Tl4rJIUiabEJRt?= =?us-ascii?Q?+6Af592Ayo340liMznXX+49Kjl9xecOglC1SKpYPZv6ii3nM6PlzbPKrvR6A?= =?us-ascii?Q?7ke62z9CPuJbrPcH2e8EI16EjHb8CJr5XHshdC6jaIb112qh30WRrTgLG7tc?= =?us-ascii?Q?rx24nFon2FdoF2w3IznSQ5gRkczv1e3vJv8Lm5cA685N9Z+ECLD9YHxUAn0F?= =?us-ascii?Q?i8xi4Nc+tjUS2UkbiJSMVHiOnnzoAHFvoYvkJlSiYPelqa4kKHUaxGSQk/FZ?= =?us-ascii?Q?jXOsDdMtyjYyi/juSfb30fiz31djEs4VZVNIctE4AhTmYx4djDqpEWWV+BhL?= =?us-ascii?Q?qOjsWUnL5HuqV2mR9gBf6vEz9D27aLG/xHBtc5agHnmcn69Vg6Ivx3psHUJ/?= =?us-ascii?Q?cFqczZcdWSAfVroCGV2Sh3kyhdxtzjutobAtz5uqvkrCZYapjNDYJWV9JzHQ?= =?us-ascii?Q?e2/wY3dZKdrSum+wj/waYrIlBv/3DUpAQ8EkBp6MpvuVSDpDR3MzmowbmMfc?= =?us-ascii?Q?xGTx1kaC/XyADnA=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB044; 5:hPoxlmwm9woXZ/79jAy1hvxoCmH3mr2GrasaucI7A6yv8gK4VbIDRlJDQSr8gM02pevSdn1LL+PzSgSExTz2yXCqFb0kXgE41glHGMNAzU4DMVn2Z/KAgPKAsn4UOrGyrwlAo3Gn+LUChI5/s63aLg==; 24:TyV6BDiPBRN489IixHqVH4kUONSrqguu4yX9ToCS2mIfzXlUYbxk8qvNAOFv/ETLQxLrVKe38VA6HvNp2XD4FrPhu1rHcXg7qA5vxH9XJBA= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2015 21:35:35.4403 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2FFO11HUB044 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org, crosthwaitepeter@gmail.com, edgar.iglesias@gmail.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v2 2/5] ssi: Move ssi.h into a separate directory 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 Move the ssi.h include file into the ssi directory. Signed-off-by: Alistair Francis --- V2: - Change git patch to indicate rename hw/arm/pxa2xx.c | 2 +- hw/arm/spitz.c | 2 +- hw/arm/stellaris.c | 2 +- hw/arm/strongarm.c | 2 +- hw/arm/tosa.c | 2 +- hw/arm/xilinx_zynq.c | 2 +- hw/arm/z2.c | 2 +- hw/block/m25p80.c | 2 +- hw/display/ads7846.c | 2 +- hw/display/ssd0323.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 2 +- hw/misc/max111x.c | 2 +- hw/sd/ssi-sd.c | 2 +- hw/ssi/pl022.c | 2 +- hw/ssi/ssi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/ssi/xilinx_spips.c | 2 +- include/hw/{ => ssi}/ssi.h | 10 ++++++---- 18 files changed, 23 insertions(+), 21 deletions(-) rename include/hw/{ => ssi}/ssi.h (96%) diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c index 164260a..534c06f 100644 --- a/hw/arm/pxa2xx.c +++ b/hw/arm/pxa2xx.c @@ -12,7 +12,7 @@ #include "sysemu/sysemu.h" #include "hw/char/serial.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "sysemu/char.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c index 2af03be..c9405af 100644 --- a/hw/arm/spitz.c +++ b/hw/arm/spitz.c @@ -16,7 +16,7 @@ #include "sysemu/sysemu.h" #include "hw/pcmcia.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/block/flash.h" #include "qemu/timer.h" #include "hw/devices.h" diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 3d6486f..c785e90 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/arm/arm.h" #include "hw/devices.h" #include "qemu/timer.h" diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 9624ecb..4d2ba02 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -34,7 +34,7 @@ #include "hw/arm/arm.h" #include "sysemu/char.h" #include "sysemu/sysemu.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" //#define DEBUG diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c index 51d0b89..6b210a6 100644 --- a/hw/arm/tosa.c +++ b/hw/arm/tosa.c @@ -19,7 +19,7 @@ #include "hw/pcmcia.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "sysemu/block-backend.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index 9f89483..9db9602 100644 --- a/hw/arm/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c @@ -24,7 +24,7 @@ #include "hw/block/flash.h" #include "sysemu/block-backend.h" #include "hw/loader.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "qemu/error-report.h" #define NUM_SPI_FLASHES 4 diff --git a/hw/arm/z2.c b/hw/arm/z2.c index b44eb76..c82fe2c 100644 --- a/hw/arm/z2.c +++ b/hw/arm/z2.c @@ -16,7 +16,7 @@ #include "hw/arm/arm.h" #include "hw/devices.h" #include "hw/i2c/i2c.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/boards.h" #include "sysemu/sysemu.h" #include "hw/block/flash.h" diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 7b9f97c..addd907 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -24,7 +24,7 @@ #include "hw/hw.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #ifndef M25P80_ERR_DEBUG #define M25P80_ERR_DEBUG 0 diff --git a/hw/display/ads7846.c b/hw/display/ads7846.c index 3f35369..cb82317 100644 --- a/hw/display/ads7846.c +++ b/hw/display/ads7846.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "ui/console.h" typedef struct { diff --git a/hw/display/ssd0323.c b/hw/display/ssd0323.c index 9727007..7545da8 100644 --- a/hw/display/ssd0323.c +++ b/hw/display/ssd0323.c @@ -10,7 +10,7 @@ /* The controller can support a variety of different displays, but we only implement one. Most of the commends relating to brightness and geometry setup are ignored. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "ui/console.h" //#define DEBUG_SSD0323 1 diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 462060f..5366cec 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -35,7 +35,7 @@ #include "sysemu/block-backend.h" #include "hw/char/serial.h" #include "exec/address-spaces.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "boot.h" diff --git a/hw/misc/max111x.c b/hw/misc/max111x.c index bef3651..d619d61 100644 --- a/hw/misc/max111x.c +++ b/hw/misc/max111x.c @@ -10,7 +10,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" typedef struct { SSISlave parent_obj; diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index e4b2d4f..4fe00fd 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -12,7 +12,7 @@ #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "hw/sd.h" //#define DEBUG_SSI_SD 1 diff --git a/hw/ssi/pl022.c b/hw/ssi/pl022.c index 61d568f..0bbf633 100644 --- a/hw/ssi/pl022.c +++ b/hw/ssi/pl022.c @@ -8,7 +8,7 @@ */ #include "hw/sysbus.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" //#define DEBUG_PL022 1 diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index 2aab79b..a0f57c0 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -12,7 +12,7 @@ * GNU GPL, version 2 or (at your option) any later version. */ -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" struct SSIBus { BusState parent_obj; diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 620573c..94bb2a7 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -29,7 +29,7 @@ #include "qemu/log.h" #include "qemu/fifo8.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #ifdef XILINX_SPI_ERR_DEBUG #define DB_PRINT(...) do { \ diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index 0910f54..e9471ff 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -27,7 +27,7 @@ #include "hw/ptimer.h" #include "qemu/log.h" #include "qemu/fifo8.h" -#include "hw/ssi.h" +#include "hw/ssi/ssi.h" #include "qemu/bitops.h" #ifndef XILINX_SPIPS_ERR_DEBUG diff --git a/include/hw/ssi.h b/include/hw/ssi/ssi.h similarity index 96% rename from include/hw/ssi.h rename to include/hw/ssi/ssi.h index df0f838..4a0a539 100644 --- a/include/hw/ssi.h +++ b/include/hw/ssi/ssi.h @@ -14,6 +14,8 @@ #include "hw/qdev.h" typedef struct SSISlave SSISlave; +typedef struct SSISlaveClass SSISlaveClass; +typedef enum SSICSMode SSICSMode; #define TYPE_SSI_SLAVE "ssi-slave" #define SSI_SLAVE(obj) \ @@ -25,14 +27,14 @@ typedef struct SSISlave SSISlave; #define SSI_GPIO_CS "ssi-gpio-cs" -typedef enum { +enum SSICSMode { SSI_CS_NONE = 0, SSI_CS_LOW, SSI_CS_HIGH, -} SSICSMode; +}; /* Slave devices. */ -typedef struct SSISlaveClass { +struct SSISlaveClass { DeviceClass parent_class; int (*init)(SSISlave *dev); @@ -55,7 +57,7 @@ typedef struct SSISlaveClass { * always be called for the device for every txrx access to the parent bus */ uint32_t (*transfer_raw)(SSISlave *dev, uint32_t val); -} SSISlaveClass; +}; struct SSISlave { DeviceState parent_obj;