Received: by 2002:a17:906:28cf:b0:a52:4db9:938b with SMTP id p15csp566511ejd; Tue, 16 Apr 2024 11:49:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUC0BXiCrl5hbtEpN78E3x2MudnOHH2HMlbuSB/N1H1b8q3PveEOEhKzbrbJfxNR7IHjXb/cwn121A2qoVWXfQ27HNhoZQS X-Google-Smtp-Source: AGHT+IHEgkeCT6Hlv7izfN3nO99K/IfUlk9X9McMa65M8jEJa660Suf/EYaZAMtaS3I/6mk//fqW X-Received: by 2002:ac8:5f07:0:b0:435:9c32:ae57 with SMTP id x7-20020ac85f07000000b004359c32ae57mr5239804qta.26.1713293358153; Tue, 16 Apr 2024 11:49:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713293358; cv=none; d=google.com; s=arc-20160816; b=HMRy5mIM3gTKxfTxPPKXljCUuteMUVcnU6UUbuiCy93aLmmUP0RWjUANL9n5kWf0qZ 2RETZZb1ApHQ1XuEl6BWAGyC+MT0B/442B7CtX5X0y0F50YXc2HhfvJdwZoWz4Erm+RE oB8e5NWOzWPQXBnjrdAznRY8UQ4IomJO55PD7iMjXm25w36z3vGULXhdI60Y0UdRHrkE 8z084e021t1hXGSvxC75AyfrTLoL3liMZ9XGu3Xa0FqyAYbDbwAnIQh49Ju73hWfT9W4 kOyS0UePQ/YYnayV2OPaIqPGd7eFC20QtKMjFVWUgwvJ4+2AlgtLZqVa7eUW9qiE9icQ nMXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zYXb4/m9oXI7w1Sc1uMalQZY0M+kZn7gKjywWZhXidY=; fh=QDZ5YkBW6RYC7h8fy6JfwMSdERpjG16RTV1iRIy6iZQ=; b=nWi2s8kmRprMrNw7yMns5IHiCu7rwgUuV1XJyUGOiG1aIauvFkKiZAY2TNPOsGQ5Aw qWQTWvV+N+vOv8eByVzq81sEUrjq1GscaLPfxkvKznt/cLDq+BDsFr9VZ00kn8x/AsJK BLRpxP51IarmAEwBRPqYiV+GkKB/1kiazSIInAWXWNMRvgD9P17ybckpNW8NJ8Jir2jC WMXSLCr0wT9AAU1nyiCkEA3JzZ9EZBlTZtydvDye2tSDBsTsdNfJMnCqLZUO2Q9VhNIr C65Ymcl08igqfYzr83uBmKfAqKiWptZFJ+XnP1onwANM+x2uPDf6/9ARLKt9pqCd0YK5 dOaQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hFHzMwoK; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v22-20020a05622a015600b004346b8f3caesi13451414qtw.520.2024.04.16.11.49.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Apr 2024 11:49:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hFHzMwoK; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwnqv-0003uJ-Op; Tue, 16 Apr 2024 14:48:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rwnqX-0003f2-EF for qemu-arm@nongnu.org; Tue, 16 Apr 2024 14:47:57 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwnqT-00033G-4f for qemu-arm@nongnu.org; Tue, 16 Apr 2024 14:47:55 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-41550858cabso30140925e9.2 for ; Tue, 16 Apr 2024 11:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713293272; x=1713898072; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zYXb4/m9oXI7w1Sc1uMalQZY0M+kZn7gKjywWZhXidY=; b=hFHzMwoKqKEFQ+Bk9JJtcfd5Kma/VxUb3Y4dBvT+Qb5l6tPcn0nfvf/uZCr3ltrciS DlwFFC6H7leExqQlxTBG6LfAWxcR/KOW54HLvHmO1H/n9aFvaPyqwd8QvrBAlnX7nPND g88LNR3DSjiLPwQdlJsPlxD+4XsI5ywZS2x5x0QpyA4ZvWWOVBkoPwUeQcLSeeQqooSb OizFaYwfoA5VS069YnO1TAbwRKHe/heyDeLZS9u/Rim01aPYvJ6wiJ0487xugrnga45i TbUS81qZdCKi94nmJfS4PpVOCeYATyrTpRRwhpAVMY1Ji+xG6mu7c+lgrHVEG1vMlNhU HmQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713293272; x=1713898072; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zYXb4/m9oXI7w1Sc1uMalQZY0M+kZn7gKjywWZhXidY=; b=ifSN+tmko+oS+nFY51qbe4RlNgRT+xAfqpJ+oH5AggHqEQ3JDDOFBm6OFb9fDEI7ev NtagbuHuuxbcsOwHj0fVCc2yxMHeAJ7JWo+TsTnGKPDIG5h7D7Kl2i5DCijYndfm5FCT 0cZsFlUARKyua1z+G4MgC2frXf1J1/8nhVzg3VY94oGi5lPcVqkgyu2cblwdhuKmg4S6 JESJBhsXB0w1FSGfQgwhGlZvs+UgdtllI9++TpxULgwRAZxgxgvOdZDtPkUbYHam1e8V Zkd7wH/n99cg6kMORCJrxNtlKvmQeuwrW/ThfdnULSYYbGuQfKNlcmbiWCBQrLYQSuQ+ TcfA== X-Gm-Message-State: AOJu0Yyf8Em5EGpxL2QG4aF6H2s3WE/ihAV8/M6cA1SQ1QA3tsp2btg8 dy/8ESLNz+SwaAQtl8hu39RDtkHJXPCIo+cleW3nby2gvPaiUjyR5y1sc8o4mGw/sz4erFZrDae + X-Received: by 2002:a05:600c:198b:b0:418:6b23:c02 with SMTP id t11-20020a05600c198b00b004186b230c02mr4398609wmq.16.1713293271618; Tue, 16 Apr 2024 11:47:51 -0700 (PDT) Received: from m1x-phil.lan ([176.176.155.61]) by smtp.gmail.com with ESMTPSA id jh2-20020a05600ca08200b00417f700eaeasm17928595wmb.22.2024.04.16.11.47.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 16 Apr 2024 11:47:51 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Corey Minyard , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/4] hw/i2c: Convert to spec v7 terminology (manually) Date: Tue, 16 Apr 2024 20:47:21 +0200 Message-ID: <20240416184722.28334-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240416184722.28334-1-philmd@linaro.org> References: <20240416184722.28334-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: 2HoXyXHM6JVh See previous commit for rationale. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i2c/i2c.h | 52 ++++++++++++++++++++++---------------------- hw/i2c/core.c | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/include/hw/i2c/i2c.h b/include/hw/i2c/i2c.h index 75c8154138..8908267c17 100644 --- a/include/hw/i2c/i2c.h +++ b/include/hw/i2c/i2c.h @@ -6,8 +6,8 @@ /* * The QEMU I2C implementation only supports simple transfers that complete - * immediately. It does not support slave devices that need to be able to - * defer their response (eg. CPU slave interfaces where the data is supplied + * immediately. It does not support target devices that need to be able to + * defer their response (eg. CPU target interfaces where the data is supplied * by the device driver in response to an interrupt). */ @@ -28,23 +28,23 @@ OBJECT_DECLARE_TYPE(I2CTarget, I2CTargetClass, struct I2CTargetClass { DeviceClass parent_class; - /* Master to slave. Returns non-zero for a NAK, 0 for success. */ + /* Controller to target. Returns non-zero for a NAK, 0 for success. */ int (*send)(I2CTarget *s, uint8_t data); /* - * Master to slave (asynchronous). - * Receiving slave must call i2c_ack(). + * Controller to target (asynchronous). + * Receiving target must call i2c_ack(). */ void (*send_async)(I2CTarget *s, uint8_t data); /* - * Slave to master. This cannot fail, the device should always + * Target to controller. This cannot fail, the device should always * return something here. */ uint8_t (*recv)(I2CTarget *s); /* - * Notify the slave of a bus state change. For start event, + * Notify the target of a bus state change. For start event, * returns non-zero to NAK an operation. For other events the * return code is not used and should be zero. */ @@ -96,7 +96,7 @@ struct I2CBus { uint8_t saved_address; bool broadcast; - /* Set from slave currently mastering the bus. */ + /* Set from target currently controlling the bus. */ QEMUBH *bh; }; @@ -107,7 +107,7 @@ int i2c_bus_busy(I2CBus *bus); * i2c_start_transfer: start a transfer on an I2C bus. * * @bus: #I2CBus to be used - * @address: address of the slave + * @address: address of the target * @is_recv: indicates the transfer direction * * When @is_recv is a known boolean constant, use the @@ -121,7 +121,7 @@ int i2c_start_transfer(I2CBus *bus, uint8_t address, bool is_recv); * i2c_start_recv: start a 'receive' transfer on an I2C bus. * * @bus: #I2CBus to be used - * @address: address of the slave + * @address: address of the target * * Returns: 0 on success, -1 on error */ @@ -131,7 +131,7 @@ int i2c_start_recv(I2CBus *bus, uint8_t address); * i2c_start_send: start a 'send' transfer on an I2C bus. * * @bus: #I2CBus to be used - * @address: address of the slave + * @address: address of the target * * Returns: 0 on success, -1 on error */ @@ -141,7 +141,7 @@ int i2c_start_send(I2CBus *bus, uint8_t address); * i2c_start_send_async: start an asynchronous 'send' transfer on an I2C bus. * * @bus: #I2CBus to be used - * @address: address of the slave + * @address: address of the target * * Return: 0 on success, -1 on error */ @@ -161,9 +161,9 @@ bool i2c_scan_bus(I2CBus *bus, uint8_t address, bool broadcast, I2CNodeList *current_devs); /** - * Create an I2C slave device on the heap. + * Create an I2C target device on the heap. * @name: a device type name - * @addr: I2C address of the slave when put on a bus + * @addr: I2C address of the target when put on a bus * * This only initializes the device state structure and allows * properties to be set. Type @name must exist. The device still @@ -172,10 +172,10 @@ bool i2c_scan_bus(I2CBus *bus, uint8_t address, bool broadcast, I2CTarget *i2c_target_new(const char *name, uint8_t addr); /** - * Create and realize an I2C slave device on the heap. + * Create and realize an I2C target device on the heap. * @bus: I2C bus to put it on - * @name: I2C slave device type name - * @addr: I2C address of the slave when put on a bus + * @name: I2C target device type name + * @addr: I2C address of the target when put on a bus * * Create the device state structure, initialize it, put it on the * specified @bus, and drop the reference to it (the device is realized). @@ -184,10 +184,10 @@ I2CTarget *i2c_target_create_simple(I2CBus *bus, const char *name, uint8_t addr); /** - * Realize and drop a reference an I2C slave device - * @dev: I2C slave device to realize + * Realize and drop a reference an I2C target device + * @dev: I2C target device to realize * @bus: I2C bus to put it on - * @addr: I2C address of the slave on the bus + * @addr: I2C address of the target on the bus * @errp: pointer to NULL initialized error object * * Returns: %true on success, %false on failure. @@ -196,27 +196,27 @@ I2CTarget *i2c_target_create_simple(I2CBus *bus, * reference to it. * * This function is useful if you have created @dev via qdev_new(), - * i2c_target_new() or i2c_slave_try_new() (which take a reference to + * i2c_target_new() or i2c_target_try_new() (which take a reference to * the device it returns to you), so that you can set properties on it * before realizing it. If you don't need to set properties then * i2c_target_create_simple() is probably better (as it does the create, * init and realize in one step). * - * If you are embedding the I2C slave into another QOM device and + * If you are embedding the I2C target into another QOM device and * initialized it via some variant on object_initialize_child() then * do not use this function, because that family of functions arrange * for the only reference to the child device to be held by the parent * via the child<> property, and so the reference-count-drop done here - * would be incorrect. (Instead you would want i2c_slave_realize(), + * would be incorrect. (Instead you would want i2c_target_realize(), * which doesn't currently exist but would be trivial to create if we * had any code that wanted it.) */ bool i2c_target_realize_and_unref(I2CTarget *dev, I2CBus *bus, Error **errp); /** - * Set the I2C bus address of a slave device - * @dev: I2C slave device - * @address: I2C address of the slave when put on a bus + * Set the I2C bus address of a target device + * @dev: I2C target device + * @address: I2C address of the target when put on a bus */ void i2c_target_set_address(I2CTarget *dev, uint8_t address); diff --git a/hw/i2c/core.c b/hw/i2c/core.c index fd34a6bc83..a8d12cae4e 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -103,7 +103,7 @@ bool i2c_scan_bus(I2CBus *bus, uint8_t address, bool broadcast, return broadcast; } -/* TODO: Make this handle multiple masters. */ +/* TODO: Make this handle multiple controllers. */ /* * Start or continue an i2c transaction. When this is called for the * first time or after an i2c_end_transfer(), if it returns an error -- 2.41.0