TheCloud/f3
1
0
Fork 0
mirror of https://github.com/AltraMayor/f3.git synced 2025-09-11 08:08:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

f3probe: improve manual reset

Browse Source 
This patch handles the edge case in wich
the drive changes its size after a reset.
This commit is contained in:
Michel Machado 2015-02-02 09:48:34 -05:00
parent ca59ef530d
commit ac2d89a0b9
1 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libdevs.c
View File

@ -415,16 +415,19 @@ static uint64_t get_udev_dev_size_byte(struct udev_device *dev)
const char *str_size_sector = const char *str_size_sector =
udev_device_get_sysattr_value(dev, "size"); udev_device_get_sysattr_value(dev, "size");
char *end; char *end;
long long ll = strtoll(str_size_sector, &end, 10); long long size_sector;
assert(str_size_sector && !*end); if (!str_size_sector)
return ll * 512LL; return 0;
size_sector = strtoll(str_size_sector, &end, 10);
assert(!*end);
return size_sector * 512LL;
} }
static char *wait_for_add_action(struct udev *udev, const char *id_serial, static char *wait_for_reset(struct udev *udev, const char *id_serial,
const char *original_devnode, uint64_t size_byte) uint64_t original_size_byte)
{ {
char *devnode = NULL; char *devnode = NULL;
bool done = false, went_to_zero = false; bool done = false, went_to_zero = false, already_changed_size = false;
struct udev_monitor *mon; struct udev_monitor *mon;
mon = create_monitor(udev, "block", "disk"); mon = create_monitor(udev, "block", "disk");
@ -441,32 +444,50 @@ static char *wait_for_add_action(struct udev *udev, const char *id_serial,
goto next; goto next;
action = udev_device_get_action(dev); action = udev_device_get_action(dev);
if (!strcmp(action, "add")) {
new_size_byte = get_udev_dev_size_byte(dev); new_size_byte = get_udev_dev_size_byte(dev);
if (!strcmp(action, "add")) {
/* Deal with the case in wich the user pulls
* the USB device.
*
* DO NOTHING.
*/
} else if (!strcmp(action, "change")) { } else if (!strcmp(action, "change")) {
/* Deal with the case in wich the user pulls /* Deal with the case in wich the user pulls
* the memory card from the card reader. * the memory card from the card reader.
*/ */
if (strcmp(udev_device_get_devnode(dev),
original_devnode))
goto next;
new_size_byte = get_udev_dev_size_byte(dev);
if (!new_size_byte) { if (!new_size_byte) {
/* Memory card removed. */ /* Memory card removed. */
went_to_zero = true; went_to_zero = true;
goto next; goto next;
} }
if (!went_to_zero || new_size_byte != size_byte) if (!went_to_zero)
goto next; goto next;
} else { } else {
/* Ignore all other actions. */ /* Ignore all other actions. */
goto next; goto next;
} }
assert(new_size_byte == size_byte); if (new_size_byte != original_size_byte) {
/* This is an edge case. */
if (!already_changed_size) {
already_changed_size = true;
went_to_zero = false;
printf("\nThe drive changed its size of %"
PRIu64 " Bytes to %" PRIu64
" Bytes after the reset.\nPlease try to unplug and plug it back again...",
original_size_byte, new_size_byte);
fflush(stdout);
goto next;
}
printf("\nThe reset failed. The drive has not returned to its original size.\n");
fflush(stdout);
exit(1);
}
devnode = strdup(udev_device_get_devnode(dev)); devnode = strdup(udev_device_get_devnode(dev));
assert(devnode); assert(devnode);
done = true; done = true;
@ -508,8 +529,7 @@ static int bdev_manual_usb_reset(struct device *dev)
printf("Please unplug and plug back the USB drive. Waiting..."); printf("Please unplug and plug back the USB drive. Waiting...");
fflush(stdout); fflush(stdout);
devnode = wait_for_add_action(udev, id_serial, devnode = wait_for_reset(udev, id_serial, dev_get_size_byte(dev));
dev_get_filename(dev), dev_get_size_byte(dev));
assert(devnode); assert(devnode);
printf(" Thanks\n\n"); printf(" Thanks\n\n");