no message
authorhfang <hfang@0aefa8ac-fc23-0410-b7a3-bf826d37e4c2>
Tue, 28 Jun 2005 08:37:16 +0000 (08:37 +0000)
committerhfang <hfang@0aefa8ac-fc23-0410-b7a3-bf826d37e4c2>
Tue, 28 Jun 2005 08:37:16 +0000 (08:37 +0000)
git-svn-id: https://efi-shell.tianocore.org/svn/efi-shell/trunk/Shell@5 0aefa8ac-fc23-0410-b7a3-bf826d37e4c2

newshell/init.c
newshell/nshell.h
newshell/nshell.inf
reset/reset.inf

index 32149b7..9f68951 100644 (file)
@@ -19,8 +19,8 @@ Abstract:
 
 --*/
 
-#include "nshell.h"
 #include "FakeHii.h"
+#include "nshell.h"
 
 extern UINT8    STRING_ARRAY_NAME[];
 extern BOOLEAN  gHiiInitialized = FALSE;
index 93f42cc..b2abfdf 100644 (file)
@@ -47,4 +47,15 @@ extern EFI_SHELL_ENVIRONMENT  *SE;
 #define EFI_NSHELL_MAJOR_VERSION  0x00000001
 #define EFI_NSHELL_MINOR_VERSION  0x00000000
 
+#undef EFI_MONOSHELL_CODE
+#undef EFI_NO_MONOSHELL_CODE
+
+#if EFI_MONOSHELL == 1
+#define EFI_MONOSHELL_CODE(code)    code
+#define EFI_NO_MONOSHELL_CODE(code)
+#else
+#define EFI_MONOSHELL_CODE(code)
+#define EFI_NO_MONOSHELL_CODE(code) code
+#endif
+
 #endif
\ No newline at end of file
index 7dcfd98..f13add7 100644 (file)
@@ -67,6 +67,7 @@ COMPONENT_TYPE       = APPLICATION
   IMAGE_ENTRY_POINT=InitializeShell
   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_ARRAY_NAME=$(BASE_NAME)Strings 
   C_STD_FLAGS = $(C_STD_FLAGS) /DSTRING_DEFINES_FILE=\"$(BASE_NAME)StrDefs.h\"
+  C_STD_FLAGS = $(C_STD_FLAGS) /DEFI_MONOSHELL=2
 
 
  
\ No newline at end of file
index 031f91a..51a2f95 100644 (file)
@@ -34,7 +34,7 @@
 --*/
 
 [defines]
-BASE_NAME            = Reset
+BASE_NAME            = Resets
 FILE_GUID            = EE14B4E9-E71C-499d-97E2-F389F7A8C565
 COMPONENT_TYPE       = APPLICATION