diff options
author | Dave Chapman <dave@dchapman.com> | 2007-09-02 19:20:59 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2007-09-02 19:20:59 +0000 |
commit | ad4b8868413a1a9e133dfe651f9074f35c1d7c48 (patch) | |
tree | 1663189a6124dfbe5097594e985cd12672260d46 /rbutil | |
parent | c5550c96746130a6e2834e8213c3f7c8d21d275c (diff) | |
download | rockbox-ad4b8868413a1a9e133dfe651f9074f35c1d7c48.tar.gz rockbox-ad4b8868413a1a9e133dfe651f9074f35c1d7c48.zip |
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 sansapatcher version is released.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14585 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/sansapatcher/sansaio-posix.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/rbutil/sansapatcher/sansaio-posix.c b/rbutil/sansapatcher/sansaio-posix.c index bf72718d64..22abc883d2 100644 --- a/rbutil/sansapatcher/sansaio-posix.c +++ b/rbutil/sansapatcher/sansaio-posix.c | |||
@@ -42,6 +42,26 @@ | |||
42 | 42 | ||
43 | #include "sansaio.h" | 43 | #include "sansaio.h" |
44 | 44 | ||
45 | #if defined(__APPLE__) && defined(__MACH__) | ||
46 | static int sansa_unmount(struct sansa_t* sansa) | ||
47 | { | ||
48 | char cmd[4096]; | ||
49 | int res; | ||
50 | |||
51 | sprintf(cmd, "/usr/sbin/diskutil unmount \"%ss1\"",sansa->diskname); | ||
52 | fprintf(stderr,"[INFO] "); | ||
53 | res = system(cmd); | ||
54 | |||
55 | if (res==0) { | ||
56 | return 0; | ||
57 | } else { | ||
58 | perror("Unmount failed"); | ||
59 | return -1; | ||
60 | } | ||
61 | } | ||
62 | #endif | ||
63 | |||
64 | |||
45 | #ifndef RBUTIL | 65 | #ifndef RBUTIL |
46 | void print_error(char* msg) | 66 | void print_error(char* msg) |
47 | { | 67 | { |
@@ -70,6 +90,11 @@ int sansa_open(struct sansa_t* sansa, int silent) | |||
70 | 90 | ||
71 | int sansa_reopen_rw(struct sansa_t* sansa) | 91 | int sansa_reopen_rw(struct sansa_t* sansa) |
72 | { | 92 | { |
93 | #if defined(__APPLE__) && defined(__MACH__) | ||
94 | if (sansa_unmount(sansa) < 0) | ||
95 | return -1; | ||
96 | #endif | ||
97 | |||
73 | close(sansa->dh); | 98 | close(sansa->dh); |
74 | sansa->dh=open(sansa->diskname,O_RDWR); | 99 | sansa->dh=open(sansa->diskname,O_RDWR); |
75 | if (sansa->dh < 0) { | 100 | if (sansa->dh < 0) { |