diff --git a/kernel/amd64/bootmain.c b/kernel/amd64/bootmain.c index fcb643a..3681eeb 100644 --- a/kernel/amd64/bootmain.c +++ b/kernel/amd64/bootmain.c @@ -61,11 +61,11 @@ void bootmain (void) { struct device* ramdisk = device_find ("RD"); vfs_create_volume ("RD", VFS_TARFS, ramdisk, false); - struct device* vdisk = device_find ("VD"); - device_probe_partitions (vdisk); + struct device* temp = device_find ("TEMP"); + device_probe_partitions (temp); - struct device* vdp0 = device_find ("VDp0"); - vfs_create_volume ("VD", VFS_FAT32, vdp0, true); + struct device* tempp0 = device_find ("TEMPp0"); + vfs_create_volume ("TEMP", VFS_FAT32, tempp0, true); proc_pid_alloc_init (); procgroup_pgid_alloc_init (); diff --git a/kernel/device/device.c b/kernel/device/device.c index f94ea12..04bd6fb 100644 --- a/kernel/device/device.c +++ b/kernel/device/device.c @@ -119,7 +119,7 @@ void ramdisk_device_init (void) { device_create ("RD", ops, lengthof (ops), &ramdrv_init, &ramdrv_fini, &init); } -void vdisk_device_init (void) { +void temp_device_init (void) { device_op_func_t ops[] = { [XDRV_GET_SIZE] = &ramdrv_get_size, [XDRV_GET_SECTOR_SIZE] = &ramdrv_get_sector_size, @@ -142,15 +142,15 @@ void vdisk_device_init (void) { mbr.ptes[0].start_lba = 1; mbr.ptes[0].sector_count = div_align_up (init.total_size, init.sector_size) - 1; - struct device* vdisk = - device_create ("VD", ops, lengthof (ops), &ramdrv_init, &ramdrv_fini, &init); + struct device* temp = + device_create ("TEMP", ops, lengthof (ops), &ramdrv_init, &ramdrv_fini, &init); size_t sector = 0; size_t sector_count = 1; - spin_lock (&vdisk->lock); - device_op (vdisk, XDRV_WRITE, NULL, NULL, §or, §or_count, &mbr); - spin_unlock (&vdisk->lock); + spin_lock (&temp->lock); + device_op (temp, XDRV_WRITE, NULL, NULL, §or, §or_count, &mbr); + spin_unlock (&temp->lock); } #if defined(__x86_64__) @@ -167,7 +167,7 @@ void devices_init (void) { terminal_device_init (); ramdisk_device_init (); - vdisk_device_init (); + temp_device_init (); #if defined(__x86_64__) ps2kb_device_init ();