Merge trunk HEAD (r44067)

[reactos.git] / reactos / boot / freeldr / freeldr / options.c

diff --git a/reactos/boot/freeldr/freeldr/options.c b/reactos/boot/freeldr/freeldr/options.c
index cc58e1d..4dabc89 100644 (file)
--- a/reactos/boot/freeldr/freeldr/options.c
+++ b/reactos/boot/freeldr/freeldr/options.c
@@ -12,9 +12,9 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <freeldr.h>
@@ -35,8 +35,12 @@ PCSTR        OptionsMenuList[] =
 
        "SEPARATOR",
 
+#ifdef HAS_OPTION_MENU_CUSTOM_BOOT
        "Custom Boot",
+#endif
+#ifdef HAS_OPTION_MENU_REBOOT
        "Reboot",
+#endif
 };
 
 enum OptionMenuItems
@@ -55,8 +59,12 @@ enum OptionMenuItems
 
        SEPARATOR2 = 9,
 
+#ifdef HAS_OPTION_MENU_CUSTOM_BOOT
        CUSTOM_BOOT = 10,
+#endif
+#ifdef HAS_OPTION_MENU_REBOOT
        REBOOT = 11,
+#endif
 };
 
 ULONG          OptionsMenuItemCount = sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]);
@@ -96,22 +104,16 @@ VOID DoOptionsMenu(VOID)
                break;
        //case SEPARATOR2:
        //      break;
+#ifdef HAS_OPTION_MENU_CUSTOM_BOOT
        case CUSTOM_BOOT:
                OptionMenuCustomBoot();
                break;
+#endif
+#ifdef HAS_OPTION_MENU_REBOOT
        case REBOOT:
                OptionMenuReboot();
                break;
+#endif
        }
 }
 
-VOID OptionMenuReboot(VOID)
-{
-       UiMessageBox("The system will now reboot.");
-
-#ifdef __i386__
-       DiskStopFloppyMotor();
-       SoftReboot();
-#else
-#endif
-}