Commit graph

61 commits

Author SHA1 Message Date
Dominik Riebeling
084d57cef4 Check if creating the dictionary worked before accessing it, not afterwards.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28860 a1c6a512-1295-4272-9138-f99709370657
2010-12-19 21:21:28 +00:00
Frank Gevaerts
037c0ef23a Remove obsolete 2nd gen nano check
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28178 a1c6a512-1295-4272-9138-f99709370657
2010-09-27 19:02:34 +00:00
Dominik Riebeling
0110e558de Remove Ipod Video 64MB handling.
Since the builds for the Ipod Video 32MB and 64MB are now unified there
is no need to handle them separately in Rockbox Utility anymore.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27966 a1c6a512-1295-4272-9138-f99709370657
2010-09-01 17:47:33 +00:00
Torne Wuff
02068ed6cd Bump ipodpatcher version number in preparation for a new ipod bootloader release
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26284 a1c6a512-1295-4272-9138-f99709370657
2010-05-25 15:43:16 +00:00
Dominik Riebeling
c8d13b6a7d Implement ipod_scsi_inquiry() on OS X.
This implements the basic functionality for sending inquiries on OS X.
The current implementation has some limitations:
- it will not respect the selected device but pick the first Ipod found.
- it is inefficient due to the way ipodpatcher expects this which doesn't
  really match how it works on OS X.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24382 a1c6a512-1295-4272-9138-f99709370657
2010-01-30 17:02:37 +00:00
Dave Chapman
428064016b Revert most of r24361 - it was committed in error.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24362 a1c6a512-1295-4272-9138-f99709370657
2010-01-28 09:37:05 +00:00
Dave Chapman
4cb879d08d 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
2010-01-28 09:20:32 +00:00
Dave Chapman
5742f89394 Fix ipodpatcher to work with new target names introduced in r23883
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23906 a1c6a512-1295-4272-9138-f99709370657
2009-12-09 13:13:58 +00:00
Björn Stenberg
c0740440ac Rename targets to be consistent in all places. (FS #10819). Take 2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23883 a1c6a512-1295-4272-9138-f99709370657
2009-12-07 12:19:08 +00:00
Dominik Riebeling
93eefbabe3 Suppress unused warnings for functions that haven't been implemented.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23785 a1c6a512-1295-4272-9138-f99709370657
2009-11-29 19:20:38 +00:00
Dominik Riebeling
bbfe57377c FS#9833: Fix Ipods being wrongly detected as MacPods on OS X
- when scanning for Ipods save the complete ipod_t structure on match. Only saving the disk name can result in the structure holding a disk name not matching the rest of the structure. This lead to wrong detection of macpod on OS X, as Mac drives might get detected later.
- reopen the Ipod in RW mode on scanning on W32 only. On OS X reopening also unmounts the player, which in turn makes resolving the mount point fail.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23707 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 16:35:35 +00:00
Dominik Riebeling
3e489c14c1 Rename print_error() in ipodpatcher and sansapatcher.
Both patchers use the same function name with one being removed when
building for rbutil. This gets in the way trying to move the patchers to
libraries, and it also results a linking dependency of sansapatcher on
ipodpatcher. Renaming the function makes both more self-contained and
avoids potential issues if the functions happen to not do the same.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23568 a1c6a512-1295-4272-9138-f99709370657
2009-11-08 13:38:10 +00:00
Dominik Riebeling
8e47406b76 Fix a compile warning.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23558 a1c6a512-1295-4272-9138-f99709370657
2009-11-07 20:03:36 +00:00
Dominik Riebeling
7e0fe361d7 Set svn:keywords property.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23545 a1c6a512-1295-4272-9138-f99709370657
2009-11-06 23:20:51 +00:00
Dave Chapman
8e95cc4329 ipodpatcher and rbutil support for the Nano2G - FS#10609 with a few further changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23142 a1c6a512-1295-4272-9138-f99709370657
2009-10-13 08:02:59 +00:00
Dominik Riebeling
4e4510ee91 Query RAM size when scanning for Ipods. Return the target string for Video 64MB when apropriate amount of RAM is detected. Makes Rockbox Utility detect it correctly for first time installs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22829 a1c6a512-1295-4272-9138-f99709370657
2009-09-25 08:39:08 +00:00
Dominik Riebeling
8b32a2d473 Always format error message using ANSI functions to get rid of type-punning when building with rbutil.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22759 a1c6a512-1295-4272-9138-f99709370657
2009-09-20 17:03:58 +00:00
Dominik Riebeling
059255705b Fix SCSI inquiry on W32.
W32 returns additional bytes containing garbage on pages returning the maximum amount (i.e. 255) of bytes. Ignoring those bytes makes the output being correct. Someone needs to find out why those additional bytes are indicated at all.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22199 a1c6a512-1295-4272-9138-f99709370657
2009-08-07 22:58:20 +00:00
Dave Chapman
1eca02d863 Add support (on Linux and win32 only - I couldn't figure this out on OS X) for reading the XML device information from ipods. This information includes the RAM size, which is potentially useful for rbutil to distinguish between the two ipod video builds. This is implemented as both a new --dump-xml option (to dump the entire XML to a file) and a new 'ramsize' field in struct ipod_t.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22165 a1c6a512-1295-4272-9138-f99709370657
2009-08-04 20:32:30 +00:00
Dave Chapman
71f0814e52 Make ipodpatcher compile on *BSD and recent Linux distributions - htole16/htole32 are standard BSD functions, and they now also appear in glibc 2.9 or later on Linux. As the functions are so simple, we just rename to avoid a clash instead of attempting to use the library versions on some platforms. Same as fix provided in FS#10428 by Alyssa Milburn.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22164 a1c6a512-1295-4272-9138-f99709370657
2009-08-04 20:03:17 +00:00
Dominik Riebeling
b22516f995 Make sure the global buffers for ipodpatcher and sansapatcher get allocated and freed only once. Fixes segfaults when the bootloader install class was instanciated multiple times.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20835 a1c6a512-1295-4272-9138-f99709370657
2009-05-01 21:35:06 +00:00
Nils Wallménius
bea3abb5c3 Bump ipodpatcher version string
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18763 a1c6a512-1295-4272-9138-f99709370657
2008-10-10 16:55:45 +00:00
Bertrik Sikken
0d760c156f Apply FS#9337 - Header file in SRC in rbutil/ipodpatcher. The parttypes.h header file apparently breaks compilation on some systems and is already #included in ipodpatcher.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18364 a1c6a512-1295-4272-9138-f99709370657
2008-08-30 09:49:00 +00:00
Dominik Riebeling
08574c43d3 When scanning for Ipod / Sansa close the disc handle of every tried disc, not only for successful checks. Fixes "no Sansa found" issues with rbutil on w32 after autodetection was used.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17893 a1c6a512-1295-4272-9138-f99709370657
2008-06-30 19:01:51 +00:00
Daniel Stenberg
2acc0ac542 Updated our source code header to explicitly mention that we are GPL v2 or
later. We still need to hunt down snippets used that are not. 1324 modified
files...
http://www.rockbox.org/mail/archive/rockbox-dev-archive-2008-06/0060.shtml


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17847 a1c6a512-1295-4272-9138-f99709370657
2008-06-28 18:10:04 +00:00
Dominik Riebeling
d131a31266 Rename variables sectorbuf and verbose to avoid clashes in rbutil. Cleanup exports a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17730 a1c6a512-1295-4272-9138-f99709370657
2008-06-17 17:52:13 +00:00
Dominik Riebeling
3f65a7051f Move C linkage binding for c++ to exporting header files instead of includes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17609 a1c6a512-1295-4272-9138-f99709370657
2008-05-22 17:51:35 +00:00
Nicolas Pennequin
367aec35d7 Fix a couple quirks from the previous commit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17370 a1c6a512-1295-4272-9138-f99709370657
2008-05-05 10:49:31 +00:00
Nicolas Pennequin
357ffb3c46 Convert the whole codebase to UTF-8, except docs/COMMITTERS and tools/creative.c, which need checking.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17369 a1c6a512-1295-4272-9138-f99709370657
2008-05-05 10:32:46 +00:00
Dominik Riebeling
194b2ca887 Check for permission denied error when trying to access the player and inform the user that raw disc access permissions are required.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17351 a1c6a512-1295-4272-9138-f99709370657
2008-05-04 11:59:04 +00:00
Barry Wardell
386f77b052 Make sansapatcher and ipodpatcher compile on OS X 10.5.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16804 a1c6a512-1295-4272-9138-f99709370657
2008-03-25 19:50:41 +00:00
Dominik Riebeling
919caf0208 allow building ipodpatcher / sansapatcher with MinGW.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16003 a1c6a512-1295-4272-9138-f99709370657
2008-01-06 11:55:55 +00:00
Magnus Holmgren
8a7c0eee8a Hopefully fix Ipod bootloader installation on Windows with RbUtilQt, without breaking ipodpatcher. I don't have any Ipod to test with, but the change is easy to revert.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15498 a1c6a512-1295-4272-9138-f99709370657
2007-11-06 19:28:14 +00:00
Jens Arnold
2a6125946d Forgot to adapate 'make clean'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14797 a1c6a512-1295-4272-9138-f99709370657
2007-09-21 06:52:45 +00:00
Jens Arnold
4ce9368058 Add a manifest to ipodpatcher.exe in order to make it request administrative rights on windows vista. This will cause a separate cmd window to pop up. The proper solution will be to implement a check for administrative rights in the executable, and tell the user to start from an elevated command prompt if not. This solution will still need a (changed) manifest.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14796 a1c6a512-1295-4272-9138-f99709370657
2007-09-21 06:24:17 +00:00
Dave Chapman
36427dde3f Bump version to 2.0 ready for release
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14744 a1c6a512-1295-4272-9138-f99709370657
2007-09-18 19:24:08 +00:00
Dave Chapman
6e7971553e Add functions to read and write the AUPD (flash update) image. "--read-aupd aupd.bin" will read (and decrypt) the AUPD image, and "--write-aupd aupd.bin" will write (and encrypt) an image. Also fix a bug in the "diskmove" function which corrupted the AUPD image when a bootloader was installed. So in order to manipulate the aupd image, you need to restore a clean firmware partition, and install the bootloader with this version of ipodpatcher. Decryption functions based on the description and sample code at http://ipodlinux.org/Flash_Decryption
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14644 a1c6a512-1295-4272-9138-f99709370657
2007-09-08 23:27:49 +00:00
Dave Chapman
f225f04d00 Mac OS X only - automatically unmount the FAT32 partition before attempting to open the disk device for writing. This step can be removed from the manual when the next ipodpatcher version is released.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14569 a1c6a512-1295-4272-9138-f99709370657
2007-09-01 22:55:37 +00:00
Dominik Wenger
ac3db33d99 ipodpatcher: adjust the targetname strings, so they match the names in rbutil.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14447 a1c6a512-1295-4272-9138-f99709370657
2007-08-24 08:10:19 +00:00
Dave Chapman
564d249e66 Detect and reject 2nd Gen Nanos when scanning for ipods, instead of failing quietly.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14152 a1c6a512-1295-4272-9138-f99709370657
2007-08-03 02:12:32 +00:00
Dave Chapman
33bc6f3e3c Yet more warning fixes - ipodpatcher should now be warning-free in rbutilqt
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14068 a1c6a512-1295-4272-9138-f99709370657
2007-07-29 21:34:28 +00:00
Dave Chapman
0be3036a20 Fix some more warnings (these only occurred on Mac OS X, so I missed them on Linux/x86).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14067 a1c6a512-1295-4272-9138-f99709370657
2007-07-29 21:25:09 +00:00
Dave Chapman
2cc80f502e Add -W to CFLAGS in Makefile and fix the generated warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14066 a1c6a512-1295-4272-9138-f99709370657
2007-07-29 21:19:14 +00:00
Dave Chapman
3b1119bf27 Fix some cosmetic bugs in error messages. These generated warnings when compiling ipodpatcher with -O2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14065 a1c6a512-1295-4272-9138-f99709370657
2007-07-29 20:43:42 +00:00
Dave Chapman
35735c66e0 Initial attempt at a --convert option to convert HFS formatted ipods (Macpods) to FAT32 format. This needs testing (as well as the existing --format feature) before adding as an option in the interactive mode and fully documenting.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14030 a1c6a512-1295-4272-9138-f99709370657
2007-07-27 20:51:36 +00:00
Dave Chapman
6a20def805 Initial (untested apart from device detection) support for 1st/2nd gen ipods (the original ones...).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14010 a1c6a512-1295-4272-9138-f99709370657
2007-07-26 20:21:11 +00:00
Dave Chapman
56780e3e41 Initial integration of a --format option, based on fat32format.exe. The main limitation is that it only works on disks with 512-byte sectors - it needs adapting to the 2048-byte sector ipods. It has only been tested on Linux and Mac OS X, with a 60GB ipod Color, but appears to work.... When this feature has been more widely tested, the intention is to add code to convert the information in an Apple Partition Map (which can currently be read by ipodpatcher) to a DOS partition table, and hence allow conversion of Macpods to Winpods.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13643 a1c6a512-1295-4272-9138-f99709370657
2007-06-16 22:32:57 +00:00
Dave Chapman
0fba85fe9e Accept both 0xb and 0xc as valid partition types for an ipod FAT32 partition. Some tools (e.g. fat32format) set the type to 0xc, and the Apple bootloader doesn't appear to care.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13614 a1c6a512-1295-4272-9138-f99709370657
2007-06-10 22:47:51 +00:00
Dave Chapman
09b247fef9 Don't just display an error message, abort.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13594 a1c6a512-1295-4272-9138-f99709370657
2007-06-08 15:30:14 +00:00
Dave Chapman
6e314e5e98 Fix typo in error message - thanks to Bryan Childs for spotting
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13593 a1c6a512-1295-4272-9138-f99709370657
2007-06-08 15:24:47 +00:00