freemyipod r602 - Code Review

Repository:	freemyipod
Revision:	< r601‎ \| r602 \| r603 >
Date:	01:21, 13 February 2011
Author:	theseven
Status:	new
Tags:
Comment:	[lib]emcore.py: Fix ipodclassic_writebbt command
Modified paths:	/emcore/trunk/tools/emcore.py (modified) (history) /emcore/trunk/tools/libemcore.py (modified) (history)

Diff [purge]

Index: emcore/trunk/tools/emcore.py
—	—	@@ -814,8 +814,7 @@
815	815	Uploads the bad block table <filename> to memory at <tempaddr>
816	816	(or an allocated block if not given) and writes it to the hard disk
817	817	"""
818		~~- if tempaddr != None:~~
819		~~- tempaddr = to_int(tempaddr)~~
	818	+ tempaddr = to_int(tempaddr)
820	819	try:
821	820	f = open(filename, 'rb')
822	821	except IOError:
Index: emcore/trunk/tools/libemcore.py
—	—	@@ -563,7 +563,7 @@
564	564	if bbtheader[0] != "emBIbbth":
565	565	raise ArgumentError("The specified file is not an emCORE hard disk BBT")
566	566	virtualsectors = bbtheader[2]
567		~~- bbtsectors = bbtheader[3]~~
	567	+ bbtsectors = bbtheader[4]
568	568	if tempaddr is None:
569	569	tempaddr = self.malloc(len(bbt))
570	570	malloc = True
—	—	@@ -575,18 +575,17 @@
576	576	count = 1
577	577	offset = 0
578	578	for i in range(bbtsectors):
579		~~- if bbtheader[4][i] == sector + count:~~
	579	+ if bbtheader[5 + i] == sector + count:
580	580	count = count + 1
581	581	else:
582	582	self.ipodclassic_hddaccess(1, sector, count, tempaddr + offset)
583	583	offset = offset + count * 4096
584		~~- sector = bbtheader[4][i]~~
	584	+ sector = bbtheader[5 +i]
585	585	count = 1
586	586	self.ipodclassic_hddaccess(1, sector, count, tempaddr + offset)
587		~~- except:~~
	587	+ finally:
588	588	if malloc == True:
589	589	self.free(tempaddr)
590		~~- raise~~
591	590
592	591	@command()
593	592	def storage_get_info(self, volume):