diff options
Diffstat (limited to 'rbutil/ipodpatcher')
-rw-r--r-- | rbutil/ipodpatcher/ipodio-posix.c | 2 | ||||
-rw-r--r-- | rbutil/ipodpatcher/ipodio-win32.c | 1 | ||||
-rw-r--r-- | rbutil/ipodpatcher/ipodpatcher.c | 2 | ||||
-rw-r--r-- | rbutil/ipodpatcher/main.c | 11 |
4 files changed, 12 insertions, 4 deletions
diff --git a/rbutil/ipodpatcher/ipodio-posix.c b/rbutil/ipodpatcher/ipodio-posix.c index e496fa39bc..065aae6303 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) | |||
185 | /* Read information about the disk */ | 185 | /* Read information about the disk */ |
186 | 186 | ||
187 | if(ioctl(ipod->dh,IPOD_SECTORSIZE_IOCTL,&ipod->sector_size) < 0) { | 187 | if(ioctl(ipod->dh,IPOD_SECTORSIZE_IOCTL,&ipod->sector_size) < 0) { |
188 | ipod->sector_size=2048; | 188 | ipod->sector_size=512; |
189 | if (!silent) { | 189 | if (!silent) { |
190 | fprintf(stderr,"[ERR] ioctl() call to get sector size failed, defaulting to %d\n" | 190 | fprintf(stderr,"[ERR] ioctl() call to get sector size failed, defaulting to %d\n" |
191 | ,ipod->sector_size); | 191 | ,ipod->sector_size); |
diff --git a/rbutil/ipodpatcher/ipodio-win32.c b/rbutil/ipodpatcher/ipodio-win32.c index eec065abb6..abf7bdf46e 100644 --- a/rbutil/ipodpatcher/ipodio-win32.c +++ b/rbutil/ipodpatcher/ipodio-win32.c | |||
@@ -181,7 +181,6 @@ ssize_t ipod_read(struct ipod_t* ipod, unsigned char* buf, int nbytes) | |||
181 | { | 181 | { |
182 | unsigned long count; | 182 | unsigned long count; |
183 | 183 | ||
184 | printf("[DEBUG] ipod_read - nbytes=%d\n",nbytes); | ||
185 | if (!ReadFile(ipod->dh, buf, nbytes, &count, NULL)) { | 184 | if (!ReadFile(ipod->dh, buf, nbytes, &count, NULL)) { |
186 | ipod_print_error(" Error reading from disk: "); | 185 | ipod_print_error(" Error reading from disk: "); |
187 | return -1; | 186 | return -1; |
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c index a21ddbd0fd..b2f01b8223 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) | |||
2080 | return -1; | 2080 | return -1; |
2081 | } | 2081 | } |
2082 | 2082 | ||
2083 | if ((n = ipod_read(ipod, ipod_sectorbuf, ipod->sector_size)) < 0) { | 2083 | if ((n = ipod_read(ipod, ipod_sectorbuf, 512)) < 0) { |
2084 | return -1; | 2084 | return -1; |
2085 | } | 2085 | } |
2086 | 2086 | ||
diff --git a/rbutil/ipodpatcher/main.c b/rbutil/ipodpatcher/main.c index 412c8733f9..6ec05666ac 100644 --- a/rbutil/ipodpatcher/main.c +++ b/rbutil/ipodpatcher/main.c | |||
@@ -33,7 +33,7 @@ | |||
33 | 33 | ||
34 | #ifdef RELEASE | 34 | #ifdef RELEASE |
35 | #undef VERSION | 35 | #undef VERSION |
36 | #define VERSION "4.1 with v3.0 bootloaders (v1.0 for 2nd Gen Nano)" | 36 | #define VERSION "4.0 with v3.0 bootloaders (v1.0 for 2nd Gen Nano)" |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | 39 | ||
@@ -398,6 +398,15 @@ int main(int argc, char* argv[]) | |||
398 | if (ipod.ramsize > 0) { printf("(%dMB RAM) ",ipod.ramsize); } | 398 | if (ipod.ramsize > 0) { printf("(%dMB RAM) ",ipod.ramsize); } |
399 | printf("(\"%s\")\n",ipod.macpod ? "macpod" : "winpod"); | 399 | printf("(\"%s\")\n",ipod.macpod ? "macpod" : "winpod"); |
400 | 400 | ||
401 | if (ipod.ipod_directory[ipod.ososimage].vers == 0x10000) { | ||
402 | fprintf(stderr,"[ERR] *** ipodpatcher does not support the 2nd Generation Nano! ***\n"); | ||
403 | #ifdef WITH_BOOTOBJS | ||
404 | printf("Press ENTER to exit ipodpatcher :"); | ||
405 | fgets(yesno,4,stdin); | ||
406 | #endif | ||
407 | return 0; | ||
408 | } | ||
409 | |||
401 | if (ipod.macpod) { | 410 | if (ipod.macpod) { |
402 | print_macpod_warning(); | 411 | print_macpod_warning(); |
403 | } | 412 | } |