Handle disk partitioning
This commit is contained in:
@ -24,23 +24,10 @@ void storedev_init(void) {
|
||||
ata_probe();
|
||||
}
|
||||
|
||||
size_t ramsd_counter = 0;
|
||||
|
||||
void storedev_register_dev_entry(StoreDev *sd, int32_t sdtype) {
|
||||
char key[20];
|
||||
|
||||
if (sdtype == STOREDEV_RAMSD) {
|
||||
ksprintf(key, "ramsd-%zu", ramsd_counter++);
|
||||
} else if (sdtype == STOREDEV_ATASD) {
|
||||
ksprintf(key, "atasd-ch%d-%c",
|
||||
sd->sd.atasd.iobase == 0x1F0 ? 0 : 1,
|
||||
sd->sd.atasd.devno == 0x00 ? 'M' : 'S'
|
||||
);
|
||||
}
|
||||
|
||||
void storedev_register_dev_entry(StoreDev *sd, char *name, int32_t sdtype) {
|
||||
spinlock_acquire(&DEVTABLE.spinlock);
|
||||
Dev *dev = NULL;
|
||||
HSHTB_ALLOC(DEVTABLE.devs, ident, key, dev);
|
||||
HSHTB_ALLOC(DEVTABLE.devs, ident, name, dev);
|
||||
spinlock_release(&DEVTABLE.spinlock);
|
||||
|
||||
if (dev == NULL) {
|
||||
@ -58,7 +45,7 @@ void storedev_unregister_dev_entry(Dev *dev) {
|
||||
spinlock_release(&DEVTABLE.spinlock);
|
||||
}
|
||||
|
||||
StoreDev *storedev_create(int32_t sdtype, void *extra) {
|
||||
StoreDev *storedev_create(int32_t sdtype, char *name, void *extra) {
|
||||
StoreDev *sd = dlmalloc(sizeof(*sd));
|
||||
if (sd == NULL) {
|
||||
return NULL;
|
||||
@ -67,28 +54,36 @@ StoreDev *storedev_create(int32_t sdtype, void *extra) {
|
||||
spinlock_acquire(&STOREDEV_LIST.spinlock);
|
||||
|
||||
sd->_magic = STOREDEV_MAGIC;
|
||||
spinlock_init(&sd->spinlock);
|
||||
|
||||
switch (sdtype) {
|
||||
case STOREDEV_RAMSD: {
|
||||
spinlock_init(&sd->spinlock);
|
||||
sd->sdtype = STOREDEV_RAMSD;
|
||||
sd->init = &ramsd_init;
|
||||
sd->cleanup = &ramsd_cleanup;
|
||||
sd->read = &ramsd_read;
|
||||
sd->write = &ramsd_write;
|
||||
sd->capacity = &ramsd_capacity;
|
||||
sd->sdtype = STOREDEV_RAMSD;
|
||||
sd->init = &ramsd_init;
|
||||
sd->cleanup = &ramsd_cleanup;
|
||||
sd->read = &ramsd_read;
|
||||
sd->write = &ramsd_write;
|
||||
sd->capacity = &ramsd_capacity;
|
||||
sd->sectorsize = STOREDEV_RAMSD_SECTORSIZE;
|
||||
} break;
|
||||
case STOREDEV_ATASD: {
|
||||
spinlock_init(&sd->spinlock);
|
||||
sd->sdtype = STOREDEV_ATASD;
|
||||
sd->init = &atasd_init;
|
||||
sd->cleanup = &atasd_cleanup;
|
||||
sd->read = &atasd_read;
|
||||
sd->write = &atasd_write;
|
||||
sd->capacity = &atasd_capacity;
|
||||
sd->sdtype = STOREDEV_ATASD;
|
||||
sd->init = &atasd_init;
|
||||
sd->cleanup = &atasd_cleanup;
|
||||
sd->read = &atasd_read;
|
||||
sd->write = &atasd_write;
|
||||
sd->capacity = &atasd_capacity;
|
||||
sd->sectorsize = STOREDEV_ATASD_SECTORSIZE;
|
||||
} break;
|
||||
case STOREDEV_PARTSD: {
|
||||
sd->sdtype = STOREDEV_PARTSD;
|
||||
sd->init = &partsd_init;
|
||||
sd->cleanup = &partsd_cleanup;
|
||||
sd->read = &partsd_read;
|
||||
sd->write = &partsd_write;
|
||||
sd->capacity = &partsd_capacity;
|
||||
sd->sectorsize = 0; // lazy
|
||||
} break;
|
||||
default:
|
||||
spinlock_release(&STOREDEV_LIST.spinlock);
|
||||
return NULL;
|
||||
@ -102,7 +97,7 @@ StoreDev *storedev_create(int32_t sdtype, void *extra) {
|
||||
LL_APPEND(STOREDEV_LIST.head, sd);
|
||||
spinlock_release(&STOREDEV_LIST.spinlock);
|
||||
|
||||
storedev_register_dev_entry(sd, sdtype);
|
||||
storedev_register_dev_entry(sd, name, sdtype);
|
||||
|
||||
return sd;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user