summaryrefslogtreecommitdiffstats
path: root/rbutil/ipodpatcher
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2010-01-28 09:20:32 +0000
committerDave Chapman <dave@dchapman.com>2010-01-28 09:20:32 +0000
commit4cb879d08d2e0c5d9cc664f2eee3651188ab58ed (patch)
tree0b02fbe98089eee3bc98b64bbfaac9b82f63daf0 /rbutil/ipodpatcher
parent2347a7dc655e3fe9415558095b43a5f7102f999d (diff)
downloadrockbox-4cb879d08d2e0c5d9cc664f2eee3651188ab58ed.tar.gz
rockbox-4cb879d08d2e0c5d9cc664f2eee3651188ab58ed.tar.bz2
rockbox-4cb879d08d2e0c5d9cc664f2eee3651188ab58ed.zip
Update the comments describing how to build ipodpatcher - no functional changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24361 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/ipodpatcher')
-rw-r--r--rbutil/ipodpatcher/Makefile5
-rw-r--r--rbutil/ipodpatcher/ipodio-posix.c2
-rw-r--r--rbutil/ipodpatcher/ipodio-win32.c1
-rw-r--r--rbutil/ipodpatcher/ipodpatcher.c2
-rw-r--r--rbutil/ipodpatcher/main.c11
5 files changed, 8 insertions, 13 deletions
diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index df2838bf3c..34b4dd6b43 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -2,11 +2,14 @@ CFLAGS=-Wall -W
BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini1g.h ipodmini2g.h ipodnano1g.h ipodvideo.h
-# Enable the next two lines to build with embedded bootloaders and the
+# Build with "make BOOTOBJS=1" to build with embedded bootloaders and the
# --install option and interactive mode. You need the full set of Rockbox
# bootloaders in this directory - download them from
# http://download.rockbox.org/bootloader/ipod/bootloaders.zip
+# Releases of ipodpatcher are created with "make RELEASE=1". This
+# enables BOOTOBJS and uses the VERSION string defined in main.c
+
ifdef RELEASE
CFLAGS+=-DRELEASE
BOOTOBJS=1
diff --git a/rbutil/ipodpatcher/ipodio-posix.c b/rbutil/ipodpatcher/ipodio-posix.c
index 065aae6303..e496fa39bc 100644
--- a/rbutil/ipodpatcher/ipodio-posix.c
+++ b/rbutil/ipodpatcher/ipodio-posix.c
@@ -185,7 +185,7 @@ int ipod_open(struct ipod_t* ipod, int silent)
/* Read information about the disk */
if(ioctl(ipod->dh,IPOD_SECTORSIZE_IOCTL,&ipod->sector_size) < 0) {
- ipod->sector_size=512;
+ ipod->sector_size=2048;
if (!silent) {
fprintf(stderr,"[ERR] ioctl() call to get sector size failed, defaulting to %d\n"
,ipod->sector_size);
diff --git a/rbutil/ipodpatcher/ipodio-win32.c b/rbutil/ipodpatcher/ipodio-win32.c
index abf7bdf46e..eec065abb6 100644
--- a/rbutil/ipodpatcher/ipodio-win32.c
+++ b/rbutil/ipodpatcher/ipodio-win32.c
@@ -181,6 +181,7 @@ ssize_t ipod_read(struct ipod_t* ipod, unsigned char* buf, int nbytes)
{
unsigned long count;
+ printf("[DEBUG] ipod_read - nbytes=%d\n",nbytes);
if (!ReadFile(ipod->dh, buf, nbytes, &count, NULL)) {
ipod_print_error(" Error reading from disk: ");
return -1;
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index b2f01b8223..a21ddbd0fd 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -2080,7 +2080,7 @@ static int find_key(struct ipod_t* ipod, int aupd, unsigned char* key)
return -1;
}
- if ((n = ipod_read(ipod, ipod_sectorbuf, 512)) < 0) {
+ if ((n = ipod_read(ipod, ipod_sectorbuf, ipod->sector_size)) < 0) {
return -1;
}
diff --git a/rbutil/ipodpatcher/main.c b/rbutil/ipodpatcher/main.c
index 6ec05666ac..412c8733f9 100644
--- a/rbutil/ipodpatcher/main.c
+++ b/rbutil/ipodpatcher/main.c
@@ -33,7 +33,7 @@
#ifdef RELEASE
#undef VERSION
-#define VERSION "4.0 with v3.0 bootloaders (v1.0 for 2nd Gen Nano)"
+#define VERSION "4.1 with v3.0 bootloaders (v1.0 for 2nd Gen Nano)"
#endif
@@ -398,15 +398,6 @@ int main(int argc, char* argv[])
if (ipod.ramsize > 0) { printf("(%dMB RAM) ",ipod.ramsize); }
printf("(\"%s\")\n",ipod.macpod ? "macpod" : "winpod");
- if (ipod.ipod_directory[ipod.ososimage].vers == 0x10000) {
- fprintf(stderr,"[ERR] *** ipodpatcher does not support the 2nd Generation Nano! ***\n");
-#ifdef WITH_BOOTOBJS
- printf("Press ENTER to exit ipodpatcher :");
- fgets(yesno,4,stdin);
-#endif
- return 0;
- }
-
if (ipod.macpod) {
print_macpod_warning();
}