Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Support cd/cdrom and hd/disk aliases on all architectures

Browse Source 
git-svn-id: svn://coreboot.org/openbios/openbios-devel@361 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Blue Swirl
2009-01-06 20:27:01 +00:00
parent eb3f96ade3
commit 4a9d1a7613
3 changed files with 22 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
arch/sparc64/tree.fs
View File

@@ -47,50 +47,3 @@ new-device
: close ;
finish-device
: ?devalias ( alias-str alias-len device-str device-len --
\ alias-str alias-len false | true )
active-package >r
" /aliases" find-device
\ 2dup ." Checking " type
2dup find-dev if \ check if device exists
drop
2over find-dev if \ do we already have an alias?
\ ." alias exists" cr
drop 2drop false
else
\ ." device exists" cr
encode-string
2swap property
true
then
else
\ ." device doesn't exist" cr
2drop false
then
r> active-package!
;
:noname
" hd"
" /pci/isa/ide0/disk@0" ?devalias not if
" /pci/isa/ide0/disk@1" ?devalias not if
" /pci/isa/ide1/disk@0" ?devalias not if
" /pci/isa/ide1/disk@1" ?devalias not if
2drop ." No disk found." cr
then
then
then
then
" cdrom"
" /pci/isa/ide0/cdrom@0" ?devalias not if
" /pci/isa/ide0/cdrom@1" ?devalias not if
" /pci/isa/ide1/cdrom@0" ?devalias not if
" /pci/isa/ide1/cdrom@1" ?devalias not if
2drop ." No cdrom found" cr
then
then
then
then
; SYSTEM-initializer

27
drivers/esp.c
View File

@@ -42,7 +42,7 @@ struct esp_dma {
typedef struct sd_private {
unsigned int bs;
const char *media_str;
const char *media_str[2];
uint32_t sectors;
uint8_t media;
uint8_t id;
@@ -74,7 +74,8 @@ static void dump_drive(sd_private_t *drive)
{
printk("SCSI DRIVE @%lx:\n", (unsigned long)drive);
printk("id: %d\n", drive->id);
printk("media: %s\n", drive->media_str);
printk("media: %s\n", drive->media_str[0]);
printk("media: %s\n", drive->media_str[1]);
printk("model: %s\n", drive->model);
printk("sectors: %d\n", drive->sectors);
printk("present: %d\n", drive->present);
@@ -183,7 +184,7 @@ read_capacity(esp_private_t *esp, sd_private_t *sd)
static unsigned int
inquiry(esp_private_t *esp, sd_private_t *sd)
{
const char *media = "UNKNOWN";
const char *media[2] = { "UNKNOWN", "UNKNOWN"};
// Setup command = Inquiry
memset(esp->buffer, 0, 7);
@@ -202,13 +203,16 @@ inquiry(esp_private_t *esp, sd_private_t *sd)
switch (sd->media) {
case TYPE_DISK:
media = "disk";
media[0] = "disk";
media[1] = "hd";
break;
case TYPE_ROM:
media = "cdrom";
media[0] = "cdrom";
media[1] = "cd";
break;
}
sd->media_str = media;
sd->media_str[0] = media[0];
sd->media_str[1] = media[1];
memcpy(sd->model, &esp->buffer[16], 16);
sd->model[17] = '\0';
@@ -406,6 +410,7 @@ NODE_METHODS(ob_esp) = {
static void
add_alias(const char *device, const char *alias)
{
DPRINTF("add_alias dev \"%s\" = alias \"%s\"\n", device, alias);
push_str("/aliases");
fword("find-device");
push_str(device);
@@ -517,10 +522,14 @@ ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset,
counter_ptr = &diskcount;
}
if (*counter_ptr == 0) {
add_alias(nodebuff, esp->sd[id].media_str);
add_alias(nodebuff, esp->sd[id].media_str[0]);
add_alias(nodebuff, esp->sd[id].media_str[1]);
}
snprintf(aliasbuff, sizeof(aliasbuff), "%s%d", esp->sd[id].media_str,
*counter_ptr);
snprintf(aliasbuff, sizeof(aliasbuff), "%s%d",
esp->sd[id].media_str[0], *counter_ptr);
add_alias(nodebuff, aliasbuff);
snprintf(aliasbuff, sizeof(aliasbuff), "%s%d",
esp->sd[id].media_str[1], *counter_ptr);
add_alias(nodebuff, aliasbuff);
snprintf(aliasbuff, sizeof(aliasbuff), "sd(0,%d,0)", id);
add_alias(nodebuff, aliasbuff);

4
drivers/ide.c
View File

@@ -1415,11 +1415,15 @@ int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0,
cd_found = 1;
set_property(aliases, "cd",
nodebuff, strlen(nodebuff) + 1);
set_property(aliases, "cdrom",
nodebuff, strlen(nodebuff) + 1);
}
if (drive->media == ide_media_disk && !hd_found) {
hd_found = 1;
set_property(aliases, "hd",
nodebuff, strlen(nodebuff) + 1);
set_property(aliases, "disk",
nodebuff, strlen(nodebuff) + 1);
}
}
}