From 0409b4827c90868ae2c7ef9a9247e9edc0485d24 Mon Sep 17 00:00:00 2001 From: jmcmullan Date: Wed, 10 Oct 2012 04:54:15 +0000 Subject: [PATCH] Tools/InstallAROS - Default to ahci.device for installation Signed-off-by: Jason S. McMullan git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@45894 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/tools/InstallAROS/main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/workbench/tools/InstallAROS/main.c b/workbench/tools/InstallAROS/main.c index 56c8ff68ba..0a27fc0bbc 100644 --- a/workbench/tools/InstallAROS/main.c +++ b/workbench/tools/InstallAROS/main.c @@ -149,7 +149,7 @@ char *dest_Path = NULL; /* DOS DEVICE NAME of part used to store "aros" char *work_Path = NULL; /* DOS DEVICE NAME of part used to store "work" */ TEXT *extras_path = NULL; /* DOS DEVICE NAME of part used to store extras */ -char *boot_Device = "ata.device"; +char *boot_Device = "ahci.device"; ULONG boot_Unit = 0; Object *check_copytowork = NULL; @@ -836,7 +836,7 @@ IPTR Install__MUIM_IC_NextStep(Class * CLASS, Object * self, Msg message) if (fssm != NULL) { boot_Device = fssm->fssm_Device; - if (strcmp(fssm->fssm_Device, "ata.device") != 0) + if (strcmp(fssm->fssm_Device, "ahci.device") != 0) boot_Unit = fssm->fssm_Unit; } else @@ -3262,7 +3262,8 @@ int main(int argc, char *argv[]) MUIA_Gauge_Current, 0, End); static char *opt_drivetypes[] = { - "IDE/SATA", + "AHCI/SATA", + "IDE", "USB", NULL }; @@ -3774,9 +3775,12 @@ int main(int argc, char *argv[]) /* Notifications upon selection of drive type */ DoMethod(cycle_drivetype, MUIM_Notify, (IPTR) MUIA_Cycle_Active, 0, (IPTR) dest_device, 3, MUIM_Set, - MUIA_String_Contents, "ata.device"); + MUIA_String_Contents, "ahci.device"); DoMethod(cycle_drivetype, MUIM_Notify, (IPTR) MUIA_Cycle_Active, 1, (IPTR) dest_device, 3, MUIM_Set, + MUIA_String_Contents, "ata.device"); + DoMethod(cycle_drivetype, MUIM_Notify, (IPTR) MUIA_Cycle_Active, 2, + (IPTR) dest_device, 3, MUIM_Set, MUIA_String_Contents, "usbscsi.device"); DoMethod(cycle_drivetype, MUIM_Notify, MUIA_Cycle_Active, MUIV_EveryTime, (IPTR) dest_unit, 3, MUIM_Set, MUIA_String_Integer, -- 2.11.4.GIT