From 2d7ad656ec5b6c8894ba0d1997b35f33821a1ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 31 Mar 2005 15:16:09 +0000 Subject: [PATCH] Added "Disable IDE DMA" safemode option. MenuItem::SetData() now asks for a const parameter. The safemode menu options now set their MenuItem::Data() to the safemode option string. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12191 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/boot/menu.h | 12 ++++++------ src/kernel/boot/loader/menu.cpp | 14 ++++++++++---- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/headers/private/kernel/boot/menu.h b/headers/private/kernel/boot/menu.h index 932dfe0871..0d5cfe8eac 100644 --- a/headers/private/kernel/boot/menu.h +++ b/headers/private/kernel/boot/menu.h @@ -1,7 +1,7 @@ /* -** Copyright 2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ + * Copyright 2004-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #ifndef KERNEL_BOOT_MENU_H #define KERNEL_BOOT_MENU_H @@ -43,8 +43,8 @@ class MenuItem : public DoublyLinkedListLinkImpl { void SetType(menu_item_type type); menu_item_type Type() const { return fType; } - void SetData(void *data); - void *Data() const { return fData; } + void SetData(const void *data); + const void *Data() const { return fData; } void SetHelpText(const char *text); const char *HelpText() const { return fHelpText; } @@ -63,7 +63,7 @@ class MenuItem : public DoublyLinkedListLinkImpl { bool fIsEnabled; menu_item_type fType; Menu *fMenu, *fSubMenu; - void *fData; + const void *fData; const char *fHelpText; }; diff --git a/src/kernel/boot/loader/menu.cpp b/src/kernel/boot/loader/menu.cpp index 8ad32cbc6f..7a30297c49 100644 --- a/src/kernel/boot/loader/menu.cpp +++ b/src/kernel/boot/loader/menu.cpp @@ -1,7 +1,7 @@ /* -** Copyright 2003-2004, Axel Dörfler, axeld@pinc-software.de. All rights reserved. -** Distributed under the terms of the Haiku License. -*/ + * Copyright 2003-2005, Axel Dörfler, axeld@pinc-software.de. All rights reserved. + * Distributed under the terms of the MIT License. + */ #include "menu.h" @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -109,7 +110,7 @@ MenuItem::SetEnabled(bool enabled) void -MenuItem::SetData(void *data) +MenuItem::SetData(const void *data) { fData = data; } @@ -404,8 +405,13 @@ add_safe_mode_menu() MenuItem *item; safeMenu->AddItem(item = new MenuItem("Safe mode")); + item->SetData(B_SAFEMODE_SAFE_MODE); item->SetType(MENU_ITEM_MARKABLE); safeMenu->AddItem(item = new MenuItem("Disable user add-ons")); + item->SetData(B_SAFEMODE_DISABLE_USER_ADD_ONS); + item->SetType(MENU_ITEM_MARKABLE); + safeMenu->AddItem(item = new MenuItem("Disable IDE DMA")); + item->SetData(B_SAFEMODE_DISABLE_IDE_DMA); item->SetType(MENU_ITEM_MARKABLE); platform_add_menus(safeMenu);