From patchwork Fri Mar 15 14:25:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BALATON Zoltan X-Patchwork-Id: 1057102 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=eik.bme.hu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44LTPN1QDXz9s00 for ; Sat, 16 Mar 2019 02:04:06 +1100 (AEDT) Received: from localhost ([127.0.0.1]:56920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4oNP-0003n2-2T for incoming@patchwork.ozlabs.org; Fri, 15 Mar 2019 11:04:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4o1E-00007h-DC for qemu-devel@nongnu.org; Fri, 15 Mar 2019 10:41:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4nvs-0005S7-1w for qemu-devel@nongnu.org; Fri, 15 Mar 2019 10:35:36 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:24837) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4nvr-0005Qb-Hx for qemu-devel@nongnu.org; Fri, 15 Mar 2019 10:35:35 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 7D51774660A; Fri, 15 Mar 2019 15:35:19 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id E7FC97465DB; Fri, 15 Mar 2019 15:35:18 +0100 (CET) Message-Id: <0b6c5527f75cd3a6668a15750516bfe24daff4e6.1552659955.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Date: Fri, 15 Mar 2019 15:25:55 +0100 MIME-Version: 1.0 To: qemu-devel@nongnu.org X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:738:2001:2001::2001 Subject: [Qemu-devel] [PATCH v2 1/2] i2c: Move contents of bitbang_i2c.h to include/hw/i2c/i2c.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , Gerd Hoffmann Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The bitbang i2c implementation is also useful for other device models such as DDC in display controllers. Because of this, part of the file had to be moved to the main i2c.h to avoid a warning in commit 2b4c1125ac. Move the rest of the hw/i2c/bitbang_i2c.h to the main i2c.h now to allow it to be used from other device models. Signed-off-by: BALATON Zoltan --- hw/i2c/bitbang_i2c.c | 2 +- hw/i2c/bitbang_i2c.h | 12 ------------ hw/i2c/ppc4xx_i2c.c | 1 - hw/i2c/versatile_i2c.c | 2 +- include/hw/i2c/i2c.h | 7 +++++++ 5 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 hw/i2c/bitbang_i2c.h diff --git a/hw/i2c/bitbang_i2c.c b/hw/i2c/bitbang_i2c.c index 8be88ee265..a1fe3ac35c 100644 --- a/hw/i2c/bitbang_i2c.c +++ b/hw/i2c/bitbang_i2c.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" #include "hw/hw.h" -#include "bitbang_i2c.h" +#include "hw/i2c/i2c.h" #include "hw/sysbus.h" //#define DEBUG_BITBANG_I2C diff --git a/hw/i2c/bitbang_i2c.h b/hw/i2c/bitbang_i2c.h deleted file mode 100644 index 9443021710..0000000000 --- a/hw/i2c/bitbang_i2c.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef BITBANG_I2C_H -#define BITBANG_I2C_H - -#include "hw/i2c/i2c.h" - -#define BITBANG_I2C_SDA 0 -#define BITBANG_I2C_SCL 1 - -bitbang_i2c_interface *bitbang_i2c_init(I2CBus *bus); -int bitbang_i2c_set(bitbang_i2c_interface *i2c, int line, int level); - -#endif diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c index d6dfafab31..a907d0194e 100644 --- a/hw/i2c/ppc4xx_i2c.c +++ b/hw/i2c/ppc4xx_i2c.c @@ -30,7 +30,6 @@ #include "cpu.h" #include "hw/hw.h" #include "hw/i2c/ppc4xx_i2c.h" -#include "bitbang_i2c.h" #define PPC4xx_I2C_MEM_SIZE 18 diff --git a/hw/i2c/versatile_i2c.c b/hw/i2c/versatile_i2c.c index da9f298ee5..88f0b89f8d 100644 --- a/hw/i2c/versatile_i2c.c +++ b/hw/i2c/versatile_i2c.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "bitbang_i2c.h" +#include "hw/i2c/i2c.h" #include "qemu/log.h" #define TYPE_VERSATILE_I2C "versatile_i2c" diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 8e236f7bb4..fa102dde80 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -81,8 +81,15 @@ uint8_t i2c_recv(I2CBus *bus); DeviceState *i2c_create_slave(I2CBus *bus, const char *name, uint8_t addr); +/* generic bitbang i2c interface */ +#define BITBANG_I2C_SDA 0 +#define BITBANG_I2C_SCL 1 + typedef struct bitbang_i2c_interface bitbang_i2c_interface; +bitbang_i2c_interface *bitbang_i2c_init(I2CBus *bus); +int bitbang_i2c_set(bitbang_i2c_interface *i2c, int line, int level); + /* lm832x.c */ void lm832x_key_event(DeviceState *dev, int key, int state);