diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-01-14 06:49:14 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-01-14 06:49:14 +0000 |
| commit | 91b6ff0001ae46c13c67d9bae8907d6c9420127f (patch) | |
| tree | 2b76458e30db9d11131f027995d3414fa0f298a7 /loader2 | |
| parent | d1caf3a505430d5dff62b1ec52055b6b6d2647bc (diff) | |
| download | anaconda-91b6ff0001ae46c13c67d9bae8907d6c9420127f.tar.gz anaconda-91b6ff0001ae46c13c67d9bae8907d6c9420127f.tar.xz anaconda-91b6ff0001ae46c13c67d9bae8907d6c9420127f.zip | |
hardware.c
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/module-info | 13 | ||||
| -rw-r--r-- | loader2/moduleinfo.c | 4 | ||||
| -rw-r--r-- | loader2/pcmcia.c | 15 |
3 files changed, 20 insertions, 12 deletions
diff --git a/loader2/module-info b/loader2/module-info index 9e2bccde2..d9fb15c05 100644 --- a/loader2/module-info +++ b/loader2/module-info @@ -885,3 +885,16 @@ fdomain_cs qlogic_cs scsi_hostadapter "Qlogic PCMCIA SCSI driver" + +# pcmcia host controllers +yenta_socket + pcmcia + "Cardbus PCMCIA Controller" + +i82365 + pcmcia + "i82365 PCMCIA socket driver" + +tcic + pcmcia + "Databook TCIC-2 PCMCIA socket driver" diff --git a/loader2/moduleinfo.c b/loader2/moduleinfo.c index 6ef940b86..346579e44 100644 --- a/loader2/moduleinfo.c +++ b/loader2/moduleinfo.c @@ -185,6 +185,10 @@ int readModuleInfo(const char * filename, moduleInfoSet mis, } else if (!strcmp(chptr, "scsi_hostadapter") || !strcmp(chptr, "scsi")) { nextModule->major = DRIVER_SCSI; + } if (!strcmp(chptr, "pcmcia")) { + nextModule->major = DRIVER_PCMCIA; + } if (!strcmp(chptr, "fs")) { + nextModule->major = DRIVER_FS; } else if (!strcmp(chptr, "cdrom")) { nextModule->major = DRIVER_CDROM; } diff --git a/loader2/pcmcia.c b/loader2/pcmcia.c index 0ada1bb7b..17996d058 100644 --- a/loader2/pcmcia.c +++ b/loader2/pcmcia.c @@ -68,22 +68,13 @@ int initializePcmciaController(moduleList modLoaded, moduleDeps modDeps, if (FL_NOPCMCIA(flags)) return 0; - + pcic = getPcicController(); if (!pcic) return 0; - for (i = 0; i < modInfo->numModules ; i++) { - if (strcmp(pcic, modInfo->moduleList[i].moduleName)) { - mods = sdupprintf("pcmcia_core:%s:ds", pcic); - logMessage("going to insert %s", mods); - /* JKFIXME: this depends on a hack until pcmcia has module-info */ - mlLoadModuleSetLocation(mods, modLoaded, modDeps, modInfo, - flags, modInfo->moduleList[i].locationID); - free(mods); - break; - } - } + mods = sdupprintf("pcmcia_core:%s:ds", pcic); + mlLoadModuleSet(mods, modLoaded, modDeps, modInfo, flags); return 0; } |