freemyipod r601 - Code Review

Repository:	freemyipod
Revision:	< r600‎ \| r601 \| r602 >
Date:	21:15, 12 February 2011
Author:	theseven
Status:	new
Tags:
Comment:	emCORE: Lock the ATA driver mutex on the iPod Classic before attempting to access the raw disk through target-specific monitor commands
Modified paths:	/emcore/trunk/target/ipodclassic/storage_ata-target.h (modified) (history) /emcore/trunk/target/ipodclassic/storage_ata.c (modified) (history) /emcore/trunk/target/ipodclassic/usbtarget.c (modified) (history)

Diff [purge]

Index: emcore/trunk/target/ipodclassic/usbtarget.c
—	—	@@ -25,6 +25,7 @@
26	26	#include "usb/usbtarget.h"
27	27	#include "usb/usbdrv.h"
28	28	#include "storage_ata-target.h"
	29	+#include "thread.h"
29	30
30	31
31	32	int usb_target_handle_request(uint32_t* buffer, int bufsize)
—	—	@@ -54,6 +55,7 @@
55	56	}
56	57	case 0xffff0002: // LOWLEVEL DISK ACCESS
57	58	{
	59	+ mutex_lock(&ata_mutex, TIMEOUT_BLOCK);
58	60	#ifdef ATA_HAVE_BBT
59	61	int rc = ata_rw_sectors_internal((((uint64_t)(buffer[3])) << 32) \| buffer[2],
60	62	buffer[4], (void*)(buffer[5]), (bool)(buffer[1]));
—	—	@@ -61,6 +63,7 @@
62	64	int rc = ata_rw_sectors((((uint64_t)(buffer[3])) << 32) \| buffer[2],
63	65	buffer[4], (void*)(buffer[5]), (bool)(buffer[1]));
64	66	#endif
	67	+ mutex_unlock(&ata_mutex);
65	68	buffer[0] = 1;
66	69	buffer[1] = (uint32_t)rc;
67	70	size = 16;
Index: emcore/trunk/target/ipodclassic/storage_ata-target.h
—	—	@@ -29,6 +29,7 @@
30	30
31	31	extern uint16_t ata_identify_data[0x100];
32	32	extern uint64_t ata_total_sectors;
	33	+extern struct mutex ata_mutex;
33	34
34	35	#ifdef ATA_HAVE_BBT
35	36	extern uint16_t (*ata_bbt)[0x20];
Index: emcore/trunk/target/ipodclassic/storage_ata.c
—	—	@@ -31,7 +31,7 @@
32	32	bool ata_lba48;
33	33	bool ata_dma;
34	34	uint64_t ata_total_sectors;
35		~~-static struct mutex ata_mutex;~~
	35	+struct mutex ata_mutex;
36	36	static struct wakeup ata_wakeup;
37	37	static uint32_t ata_dma_flags;
38	38	static long ata_last_activity_value = -1;