From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUf3G-00083S-UN for qemu-devel@nongnu.org; Mon, 31 Mar 2014 12:27:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUf35-0003aC-KT for qemu-devel@nongnu.org; Mon, 31 Mar 2014 12:27:10 -0400 Received: from mail-qg0-x22d.google.com ([2607:f8b0:400d:c04::22d]:62595) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUf35-0003a1-FB for qemu-devel@nongnu.org; Mon, 31 Mar 2014 12:26:59 -0400 Received: by mail-qg0-f45.google.com with SMTP id j5so7614722qga.18 for ; Mon, 31 Mar 2014 09:26:59 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 31 Mar 2014 18:26:34 +0200 Message-Id: <1396283195-6819-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1396283195-6819-1-git-send-email-pbonzini@redhat.com> References: <1396283195-6819-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for-2.0 6/7] tmp105-test: add a second sensor and test that one List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, afaerber@suse.de This will make it easier to reach the device under test via QOM. Signed-off-by: Paolo Bonzini --- tests/tmp105-test.c | 17 +++++++++-------- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c index 20a1894..4e640b4 100644 --- a/tests/tmp105-test.c +++ b/tests/tmp105-test.c @@ -15,10 +15,10 @@ #define OMAP2_I2C_1_BASE 0x48070000 -#define N8X0_ADDR 0x48 +#define TMP105_TEST_ID "tmp105-test" +#define TMP105_TEST_ADDR 0x49 static I2CAdapter *i2c; -static uint8_t addr; static uint16_t tmp105_get16(I2CAdapter *i2c, uint8_t addr, uint8_t reg) { @@ -61,14 +61,14 @@ static void send_and_receive(void) { uint16_t value; - value = tmp105_get16(i2c, addr, TMP105_REG_TEMPERATURE); + value = tmp105_get16(i2c, TMP105_TEST_ADDR, TMP105_REG_TEMPERATURE); g_assert_cmpuint(value, ==, 0); /* reset */ - tmp105_set8(i2c, addr, TMP105_REG_CONFIG, 0); + tmp105_set8(i2c, TMP105_TEST_ADDR, TMP105_REG_CONFIG, 0); - tmp105_set16(i2c, addr, TMP105_REG_T_LOW, 0x1234); - tmp105_set16(i2c, addr, TMP105_REG_T_HIGH, 0x4231); + tmp105_set16(i2c, TMP105_TEST_ADDR, TMP105_REG_T_LOW, 0x1234); + tmp105_set16(i2c, TMP105_TEST_ADDR, TMP105_REG_T_HIGH, 0x4231); } int main(int argc, char **argv) @@ -78,9 +78,10 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - s = qtest_start("-machine n800"); + s = qtest_start("-machine n800 " + "-device tmp105,bus=i2c-bus.0,id=" TMP105_TEST_ID + ",address=0x49"); i2c = omap_i2c_create(OMAP2_I2C_1_BASE); - addr = N8X0_ADDR; qtest_add_func("/tmp105/tx-rx", send_and_receive); -- 1.9.0