aboutsummaryrefslogtreecommitdiff
path: root/src/bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bus.c')
-rw-r--r--src/bus.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/bus.c b/src/bus.c
index 2515b0d..d136cb8 100644
--- a/src/bus.c
+++ b/src/bus.c
@@ -97,8 +97,13 @@ int scanbus(nndevice_t** device, int mask)
if((ioctl(fd, BLKGETSIZE, &blocks)) == 0)
{
size = blocks * blocksize;
- printf("%s ", entries.gl_pathv[j]);
- printf("%lu %lu %.2f\n", blocks, size, (double)size / (1024 * 1024 * 1024));
+ strncpy(device[j]->path, entries.gl_pathv[j], sizeof(device[j]->path));
+ device[j]->blks = blocks;
+ device[j]->sz = size;
+ device[j]->blksz = 512;
+
+ printf("%s ", device[j]->path);
+ printf("%llu %llu %.2f\n", device[j]->blks, device[j]->sz, (double)device[j]->sz / (1024 * 1024 * 1024));
}
close(fd);
}
@@ -121,19 +126,18 @@ int selectbus(char** flags)
return (mask = BUS_BOTH);
}
- mask = 0;
while(flags[i] != NULL)
{
if(!strcmp(flags[i], "ide"))
{
mask |= BUS_IDE;
- printf("IDE (0x%02X)\n", mask);
+ COM(self, "IDE (0x%02X)\n", mask);
}
if(!strcmp(flags[i], "scsi"))
{
mask |= BUS_SCSI;
- printf("SCSI (0x%02X)\n", mask);
+ COM(self, "SCSI (0x%02X)\n", mask);
}
i++;