freemyipod r386 - Code Review

Repository:	freemyipod
Revision:	< r385‎ \| r386 \| r387 >
Date:	18:42, 26 December 2010
Author:	theseven
Status:	new
Tags:
Comment:	emBIOS: Fix occasional I2C hangs on S5L8702
Modified paths:	/embios/trunk/target/ipodnano3g/i2c.c (modified) (history) /embios/trunk/target/ipodnano3g/s5l8702.h (modified) (history)

Diff [purge]

Index: embios/trunk/target/ipodnano3g/i2c.c
—	—	@@ -38,14 +38,19 @@
39	39	void i2c_send(uint32_t bus, uint32_t device, uint32_t address, const uint8_t* data, uint32_t length)
40	40	{
41	41	mutex_lock(&i2cmutex, TIMEOUT_BLOCK);
	42	+ while (IIC10(bus));
42	43	IICDS(bus) = device & ~1;
	44	+ while (IIC10(bus));
43	45	IICSTAT(bus) = 0xF0;
	46	+ while (IIC10(bus));
44	47	IICCON(bus) = 0xB7;
45	48	while ((IICCON(bus) & 0x10) == 0) yield();
46	49	if (address >= 0)
47	50	{
48	51	/* write address */
	52	+ while (IIC10(bus));
49	53	IICDS(bus) = address;
	54	+ while (IIC10(bus));
50	55	IICCON(bus) = 0xB7;
51	56	while ((IICCON(bus) & 0x10) == 0) yield();
52	57	}
—	—	@@ -52,12 +57,16 @@
53	58	/* write data */
54	59	while (length--)
55	60	{
	61	+ while (IIC10(bus));
56	62	IICDS(bus) = *data++;
	63	+ while (IIC10(bus));
57	64	IICCON(bus) = 0xB7;
58	65	while ((IICCON(bus) & 0x10) == 0) yield();
59	66	}
60	67	/* STOP */
	68	+ while (IIC10(bus));
61	69	IICSTAT(bus) = 0xD0;
	70	+ while (IIC10(bus));
62	71	IICCON(bus) = 0xB7;
63	72	while ((IICSTAT(bus) & (1 << 5)) != 0) yield();
64	73	mutex_unlock(&i2cmutex);
—	—	@@ -69,28 +78,39 @@
70	79	if (address >= 0)
71	80	{
72	81	/* START */
	82	+ while (IIC10(bus));
73	83	IICDS(bus) = device & ~1;
	84	+ while (IIC10(bus));
74	85	IICSTAT(bus) = 0xF0;
	86	+ while (IIC10(bus));
75	87	IICCON(bus) = 0xB7;
76	88	while ((IICCON(bus) & 0x10) == 0) yield();
77	89	/* write address */
	90	+ while (IIC10(bus));
78	91	IICDS(bus) = address;
	92	+ while (IIC10(bus));
79	93	IICCON(bus) = 0xB7;
80	94	while ((IICCON(bus) & 0x10) == 0) yield();
81	95	}
82	96	/* (repeated) START */
	97	+ while (IIC10(bus));
83	98	IICDS(bus) = device \| 1;
	99	+ while (IIC10(bus));
84	100	IICSTAT(bus) = 0xB0;
	101	+ while (IIC10(bus));
85	102	IICCON(bus) = 0xB7;
86	103	while ((IICCON(bus) & 0x10) == 0) yield();
87	104	while (length--)
88	105	{
	106	+ while (IIC10(bus));
89	107	IICCON(bus) = (length == 0) ? 0x37 : 0xB7; /* NACK or ACK */
90	108	while ((IICCON(bus) & 0x10) == 0) yield();
91	109	*data++ = IICDS(bus);
92	110	}
93	111	/* STOP */
	112	+ while (IIC10(bus));
94	113	IICSTAT(bus) = 0x90;
	114	+ while (IIC10(bus));
95	115	IICCON(bus) = 0xB7;
96	116	while ((IICSTAT(bus) & (1 << 5)) != 0) yield();
97	117	mutex_unlock(&i2cmutex);
Index: embios/trunk/target/ipodnano3g/s5l8702.h
—	—	@@ -99,6 +99,7 @@
100	100	#define IICSTAT(bus) (((uint32_t volatile)(0x3C600004 + 0x300000 * (bus))))
101	101	#define IICADD(bus) (((uint32_t volatile)(0x3C600008 + 0x300000 * (bus))))
102	102	#define IICDS(bus) (((uint32_t volatile)(0x3C60000C + 0x300000 * (bus))))
	103	+#define IIC10(bus) (((uint32_t volatile)(0x3C600010 + 0x300000 * (bus))))
103	104
104	105
105	106	/////INTERRUPT CONTROLLERS/////

freemyipod r386 - Code Review

Diff [purge]

Navigation menu

Personal tools

Namespaces

Variants

Views

More

Search

Navigation

Info

Reverse engineering Results

Exploiting

Other Guides

Tools