From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUjUQ-0006vS-RA for qemu-devel@nongnu.org; Mon, 31 Mar 2014 17:11:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WUjUA-0006IT-LW for qemu-devel@nongnu.org; Mon, 31 Mar 2014 17:11:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49312 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WUjUA-0006Eb-FV for qemu-devel@nongnu.org; Mon, 31 Mar 2014 17:11:14 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 31 Mar 2014 23:11:01 +0200 Message-Id: <1396300262-10430-16-git-send-email-afaerber@suse.de> In-Reply-To: <1396300262-10430-1-git-send-email-afaerber@suse.de> References: <1396300262-10430-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0 15/16] 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: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Paolo Bonzini This will make it easier to reach the device under test via QOM. Signed-off-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- tests/tmp105-test.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 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 @@ =20 #define OMAP2_I2C_1_BASE 0x48070000 =20 -#define N8X0_ADDR 0x48 +#define TMP105_TEST_ID "tmp105-test" +#define TMP105_TEST_ADDR 0x49 =20 static I2CAdapter *i2c; -static uint8_t addr; =20 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; =20 - value =3D tmp105_get16(i2c, addr, TMP105_REG_TEMPERATURE); + value =3D tmp105_get16(i2c, TMP105_TEST_ADDR, TMP105_REG_TEMPERATURE= ); g_assert_cmpuint(value, =3D=3D, 0); =20 /* reset */ - tmp105_set8(i2c, addr, TMP105_REG_CONFIG, 0); + tmp105_set8(i2c, TMP105_TEST_ADDR, TMP105_REG_CONFIG, 0); =20 - 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); } =20 int main(int argc, char **argv) @@ -78,9 +78,10 @@ int main(int argc, char **argv) =20 g_test_init(&argc, &argv, NULL); =20 - s =3D qtest_start("-machine n800"); + s =3D qtest_start("-machine n800 " + "-device tmp105,bus=3Di2c-bus.0,id=3D" TMP105_TEST_I= D + ",address=3D0x49"); i2c =3D omap_i2c_create(OMAP2_I2C_1_BASE); - addr =3D N8X0_ADDR; =20 qtest_add_func("/tmp105/tx-rx", send_and_receive); =20 --=20 1.8.4.5