freemyipod r247 - Code Review

Repository:	freemyipod
Revision:	< r246‎ \| r247 \| r248 >
Date:	23:47, 2 November 2010
Author:	theseven
Status:	new
Tags:
Comment:	UMSboot: Fix issues with long file names
Modified paths:	/umsboot/main.c (modified) (history)

Diff [purge]

Index: umsboot/main.c
—	—	@@ -106,15 +106,15 @@
107	107
108	108	void swap(src, dest)
109	109	{
	110	+ memcpy(swapbuf, ramdisk[dest], RAMDISK_SECTORSIZE);
110	111	uint16_t srcmap = swapmap[src];
111	112	uint16_t destmap = swaprev[dest];
112		~~- memcpy(swapbuf, ramdisk[dest], RAMDISK_SECTORSIZE);~~
113	113	memcpy(ramdisk[dest], ramdisk[srcmap], RAMDISK_SECTORSIZE);
	114	+ swapmap[src] = dest;
	115	+ swaprev[dest] = src;
114	116	memcpy(ramdisk[srcmap], swapbuf, RAMDISK_SECTORSIZE);
115		~~- swapmap[src] = dest;~~
	117	+ swaprev[srcmap] = destmap;
116	118	swapmap[destmap] = srcmap;
117		~~- swaprev[srcmap] = destmap;~~
118		~~- swaprev[dest] = src;~~
119	119	}
120	120
121	121	void main()
—	—	@@ -131,7 +131,7 @@
132	132	while (vbus_state() && !usb_ejected);
133	133	udelay(200000);
134	134	usb_exit();
135		~~- lcdconsole_puts("\nLoading UBI File...\n", 0, 0xffff);~~
	135	+ lcdconsole_puts("\nLoading UBI file...\n", 0, 0xffff);
136	136	int found = 0;
137	137	uint16_t cluster;
138	138	uint32_t size;
—	—	@@ -146,8 +146,9 @@
147	147	ramdisk[1 + fatsectors][i] = 0xe5;
148	148	found++;
149	149	}
150		~~- else totalclusters += (((uint32_t)&ramdisk[1 + fatsectors][i + 28])~~
151		~~- + RAMDISK_SECTORSIZE - 1) / RAMDISK_SECTORSIZE;~~
	150	+ else if (((uint16_t)&ramdisk[1 + fatsectors][i + 26]))
	151	+ totalclusters += (((uint32_t)&ramdisk[1 + fatsectors][i + 28])
	152	+ + RAMDISK_SECTORSIZE - 1) / RAMDISK_SECTORSIZE;
152	153	if (!found)
153	154	{
154	155	lcdconsole_puts("No UBI file found!", 0, 0xffff);