disk: Remove old disk functions (they are not used anymore)
This commit is contained in:
1 parent
e30e08136a
commit
e66015b880
2 files changed
-110
No files matched your search
-108
@@ -234,15 +234,6 @@ enum device disk_get_device(struct usb_device_info * dev) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int disk_flash_raw(const char * blkdev, const char * file) {
|
|
||||||
|
|
||||||
ERROR("Not implemented yet");
|
|
||||||
(void)blkdev;
|
|
||||||
(void)file;
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int disk_flash_image(struct usb_device_info * dev, struct image * image) {
|
int disk_flash_image(struct usb_device_info * dev, struct image * image) {
|
||||||
|
|
||||||
ERROR("Not implemented yet");
|
ERROR("Not implemented yet");
|
||||||
@@ -252,105 +243,6 @@ int disk_flash_image(struct usb_device_info * dev, struct image * image) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int disk_dump_raw(const char * blkdev, const char * file) {
|
|
||||||
|
|
||||||
int fd1, fd2;
|
|
||||||
int ret;
|
|
||||||
char * path;
|
|
||||||
uint64_t blksize;
|
|
||||||
size_t need, readed;
|
|
||||||
ssize_t size;
|
|
||||||
struct stat st;
|
|
||||||
struct statvfs buf;
|
|
||||||
|
|
||||||
printf("Dump block device %s to file %s...\n", blkdev, file);
|
|
||||||
|
|
||||||
if ( stat(blkdev, &st) != 0 ) {
|
|
||||||
ERROR_INFO("Cannot stat block device %s", blkdev);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ! S_ISBLK(st.st_mode) ) {
|
|
||||||
ERROR("Invalid block device %s", blkdev);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
fd1 = open(blkdev, O_RDONLY);
|
|
||||||
|
|
||||||
if ( fd1 < 0 ) {
|
|
||||||
ERROR_INFO("Cannot open block device %s", blkdev);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ioctl(fd1, BLKGETSIZE64, &blksize) != 0 ) {
|
|
||||||
ERROR_INFO("Cannot get size of block device %s", blkdev);
|
|
||||||
close(fd1);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( blksize > ULLONG_MAX ) {
|
|
||||||
ERROR("Block device %s is too big", blkdev);
|
|
||||||
close(fd1);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( blksize == 0 ) {
|
|
||||||
ERROR("Block device %s has zero size", blkdev);
|
|
||||||
close(fd1);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
path = strdup(file);
|
|
||||||
if ( ! path ) {
|
|
||||||
ALLOC_ERROR();
|
|
||||||
close(fd1);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = statvfs(dirname(path), &buf);
|
|
||||||
|
|
||||||
free(path);
|
|
||||||
|
|
||||||
if ( ret == 0 && buf.f_bsize * buf.f_bfree < blksize ) {
|
|
||||||
ERROR("Not enough free space (have: %llu, need: %llu)", (unsigned long long int)(buf.f_bsize) * buf.f_bfree, (unsigned long long int)blksize);
|
|
||||||
close(fd1);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
fd2 = creat(file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
|
|
||||||
|
|
||||||
if ( fd2 < 0 ) {
|
|
||||||
ERROR_INFO("Cannot create file %s", file);
|
|
||||||
close(fd1);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
readed = 0;
|
|
||||||
printf_progressbar(0, blksize);
|
|
||||||
|
|
||||||
while ( readed < blksize ) {
|
|
||||||
need = blksize - readed;
|
|
||||||
if ( need > sizeof(global_buf) )
|
|
||||||
need = sizeof(global_buf);
|
|
||||||
size = read(fd1, global_buf, need);
|
|
||||||
if ( size == 0 )
|
|
||||||
break;
|
|
||||||
if ( write(fd2, global_buf, size) != size ) {
|
|
||||||
PRINTF_ERROR("Dumping image failed");
|
|
||||||
close(fd1);
|
|
||||||
close(fd2);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
readed += size;
|
|
||||||
printf_progressbar(readed, blksize);
|
|
||||||
}
|
|
||||||
|
|
||||||
close(fd1);
|
|
||||||
close(fd2);
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
int disk_dump_image(struct usb_device_info * dev, enum image_type image, const char * file) {
|
int disk_dump_image(struct usb_device_info * dev, enum image_type image, const char * file) {
|
||||||
|
|
||||||
ERROR("Not implemented yet");
|
ERROR("Not implemented yet");
|
||||||
|
|||||||
@@ -27,8 +27,6 @@ int disk_init(struct usb_device_info * dev);
|
|||||||
|
|
||||||
enum device disk_get_device(struct usb_device_info * dev);
|
enum device disk_get_device(struct usb_device_info * dev);
|
||||||
|
|
||||||
int disk_flash_raw(const char * blkdev, const char * file);
|
|
||||||
int disk_dump_raw(const char * blkdev, const char * file);
|
|
||||||
int disk_open_dev(int maj, int min, int partition, int readonly);
|
int disk_open_dev(int maj, int min, int partition, int readonly);
|
||||||
int disk_dump_dev(int fd, const char * file);
|
int disk_dump_dev(int fd, const char * file);
|
||||||
int disk_flash_dev(int fd, const char * file);
|
int disk_flash_dev(int fd, const char * file);
|
||||||
|
|||||||
Reference in new issue
Block a user