freemyipod r637 - Code Review

Repository:	freemyipod
Revision:	< r636‎ \| r637 \| r638 >
Date:	00:18, 21 February 2011
Author:	theseven
Status:	new
Tags:
Comment:	emCORE: Fix duplicate definition of ata_num_drives for the iPod Classic
Modified paths:	/emcore/trunk/constants/mmc.h (modified) (history) /emcore/trunk/target/ipodclassic/storage_ata.c (modified) (history)

Diff [purge]

Index: emcore/trunk/target/ipodclassic/storage_ata.c
—	—	@@ -544,11 +544,6 @@
545	545	return ata_powered;
546	546	}
547	547
548		~~-int ata_num_drives(void)~~
549		-{
550		~~- return 1;~~
551		-}
552		-
553	548	int ata_set_feature(uint32_t feature, uint32_t param)
554	549	{
555	550	PASS_RC(ata_wait_for_rdy(500000), 1, 0);
—	—	@@ -1116,7 +1111,6 @@
1117	1112	return 0;
1118	1113	}
1119	1114
1120		~~-#ifdef CONFIG_STORAGE_MULTI~~
1121	1115	int ata_num_drives(int first_drive)
1122	1116	{
1123	1117	/* We don't care which logical drive number(s) we have been assigned */
—	—	@@ -1124,7 +1118,6 @@
1125	1119
1126	1120	return 1;
1127	1121	}
1128		~~-#endif~~
1129	1122
1130	1123	void INT_ATA()
1131	1124	{
Index: emcore/trunk/constants/mmc.h
—	—	@@ -21,8 +21,8 @@
22	22	//
23	23
24	24
25		~~-#ifndef __CONSTANTS_MMC_H__~~
26		~~-#define __CONSTANTS_MMC_H__~~
	25	+#ifndef __CONSTANTS_MMC_H__
	26	+#define __CONSTANTS_MMC_H__
27	27
28	28
29	29	#include "global.h"