summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu-efi-3.0/inc/efidef.h4
-rw-r--r--gnu-efi-3.0/inc/efilib.h40
-rw-r--r--gnu-efi-3.0/inc/efirtlib.h18
-rw-r--r--gnu-efi-3.0/lib/misc.c6
-rw-r--r--gnu-efi-3.0/lib/runtime/efirtlib.c16
-rw-r--r--gnu-efi-3.0/lib/runtime/rtstr.c12
-rw-r--r--gnu-efi-3.0/lib/str.c40
7 files changed, 67 insertions, 69 deletions
diff --git a/gnu-efi-3.0/inc/efidef.h b/gnu-efi-3.0/inc/efidef.h
index db9bc71..666b193 100644
--- a/gnu-efi-3.0/inc/efidef.h
+++ b/gnu-efi-3.0/inc/efidef.h
@@ -23,7 +23,9 @@ Revision History
typedef UINT16 CHAR16;
typedef UINT8 CHAR8;
typedef UINT8 BOOLEAN;
-
+#ifndef CONST
+ #define CONST const
+#endif
#ifndef TRUE
#define TRUE ((BOOLEAN) 1)
#define FALSE ((BOOLEAN) 0)
diff --git a/gnu-efi-3.0/inc/efilib.h b/gnu-efi-3.0/inc/efilib.h
index 740c2ff..1ff14ad 100644
--- a/gnu-efi-3.0/inc/efilib.h
+++ b/gnu-efi-3.0/inc/efilib.h
@@ -186,34 +186,34 @@ SetMem (
VOID
CopyMem (
IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Src,
IN UINTN len
);
INTN
CompareMem (
- IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Dest,
+ IN CONST VOID *Src,
IN UINTN len
);
INTN
StrCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2
);
INTN
StrnCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2,
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2,
IN UINTN len
);
INTN
StriCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2
);
VOID
@@ -229,51 +229,51 @@ StrUpr (
VOID
StrCpy (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
);
VOID
StrCat (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
);
UINTN
StrLen (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
);
UINTN
StrSize (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
);
CHAR16 *
StrDuplicate (
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
);
UINTN
strlena (
- IN CHAR8 *s1
+ IN CONST CHAR8 *s1
);
UINTN
strcmpa (
- IN CHAR8 *s1,
- IN CHAR8 *s2
+ IN CONST CHAR8 *s1,
+ IN CONST CHAR8 *s2
);
UINTN
strncmpa (
- IN CHAR8 *s1,
- IN CHAR8 *s2,
+ IN CONST CHAR8 *s1,
+ IN CONST CHAR8 *s2,
IN UINTN len
);
UINTN
xtoi (
- CHAR16 *str
+ CONST CHAR16 *str
);
UINTN
diff --git a/gnu-efi-3.0/inc/efirtlib.h b/gnu-efi-3.0/inc/efirtlib.h
index 0100180..c073ead 100644
--- a/gnu-efi-3.0/inc/efirtlib.h
+++ b/gnu-efi-3.0/inc/efirtlib.h
@@ -42,23 +42,23 @@ VOID
RUNTIMEFUNCTION
RtCopyMem (
IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Src,
IN UINTN len
);
INTN
RUNTIMEFUNCTION
RtCompareMem (
- IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Dest,
+ IN CONST VOID *Src,
IN UINTN len
);
INTN
RUNTIMEFUNCTION
RtStrCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2
);
@@ -66,26 +66,26 @@ VOID
RUNTIMEFUNCTION
RtStrCpy (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
);
VOID
RUNTIMEFUNCTION
RtStrCat (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
);
UINTN
RUNTIMEFUNCTION
RtStrLen (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
);
UINTN
RUNTIMEFUNCTION
RtStrSize (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
);
INTN
diff --git a/gnu-efi-3.0/lib/misc.c b/gnu-efi-3.0/lib/misc.c
index 1a68864..32f48cc 100644
--- a/gnu-efi-3.0/lib/misc.c
+++ b/gnu-efi-3.0/lib/misc.c
@@ -111,7 +111,7 @@ SetMem (
VOID
CopyMem (
IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Src,
IN UINTN len
)
{
@@ -120,8 +120,8 @@ CopyMem (
INTN
CompareMem (
- IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Dest,
+ IN CONST VOID *Src,
IN UINTN len
)
{
diff --git a/gnu-efi-3.0/lib/runtime/efirtlib.c b/gnu-efi-3.0/lib/runtime/efirtlib.c
index bae75d7..f782e4c 100644
--- a/gnu-efi-3.0/lib/runtime/efirtlib.c
+++ b/gnu-efi-3.0/lib/runtime/efirtlib.c
@@ -64,14 +64,13 @@ VOID
RUNTIMEFUNCTION
RtCopyMem (
IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Src,
IN UINTN len
)
{
- CHAR8 *d, *s;
-
+ CHAR8 *d;
+ CONST CHAR8 *s = Src;
d = Dest;
- s = Src;
while (len--) {
*(d++) = *(s++);
}
@@ -83,15 +82,12 @@ RtCopyMem (
INTN
RUNTIMEFUNCTION
RtCompareMem (
- IN VOID *Dest,
- IN VOID *Src,
+ IN CONST VOID *Dest,
+ IN CONST VOID *Src,
IN UINTN len
)
{
- CHAR8 *d, *s;
-
- d = Dest;
- s = Src;
+ CONST CHAR8 *d = Dest, *s = Src;
while (len--) {
if (*d != *s) {
return *d - *s;
diff --git a/gnu-efi-3.0/lib/runtime/rtstr.c b/gnu-efi-3.0/lib/runtime/rtstr.c
index 332e50a..e283c09 100644
--- a/gnu-efi-3.0/lib/runtime/rtstr.c
+++ b/gnu-efi-3.0/lib/runtime/rtstr.c
@@ -23,8 +23,8 @@ Revision History
INTN
RUNTIMEFUNCTION
RtStrCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2
)
// compare strings
{
@@ -47,7 +47,7 @@ VOID
RUNTIMEFUNCTION
RtStrCpy (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
)
// copy strings
{
@@ -64,7 +64,7 @@ VOID
RUNTIMEFUNCTION
RtStrCat (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
)
{
RtStrCpy(Dest+StrLen(Dest), Src);
@@ -76,7 +76,7 @@ RtStrCat (
UINTN
RUNTIMEFUNCTION
RtStrLen (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
)
// string length
{
@@ -92,7 +92,7 @@ RtStrLen (
UINTN
RUNTIMEFUNCTION
RtStrSize (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
)
// string size
{
diff --git a/gnu-efi-3.0/lib/str.c b/gnu-efi-3.0/lib/str.c
index 8daf08b..378e920 100644
--- a/gnu-efi-3.0/lib/str.c
+++ b/gnu-efi-3.0/lib/str.c
@@ -20,8 +20,8 @@ Revision History
INTN
StrCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2
)
// compare strings
{
@@ -30,8 +30,8 @@ StrCmp (
INTN
StrnCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2,
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2,
IN UINTN len
)
// compare strings
@@ -70,15 +70,15 @@ LibStubStrLwrUpr (
INTN
StriCmp (
- IN CHAR16 *s1,
- IN CHAR16 *s2
+ IN CONST CHAR16 *s1,
+ IN CONST CHAR16 *s2
)
// compare strings
{
if (UnicodeInterface == &LibStubUnicodeInterface)
- return UnicodeInterface->StriColl(UnicodeInterface, s1, s2);
+ return UnicodeInterface->StriColl(UnicodeInterface, (CHAR16 *)s1, (CHAR16 *)s2);
else
- return uefi_call_wrapper(UnicodeInterface->StriColl, 3, UnicodeInterface, s1, s2);
+ return uefi_call_wrapper(UnicodeInterface->StriColl, 3, UnicodeInterface, (CHAR16 *)s1, (CHAR16 *)s2);
}
VOID
@@ -106,7 +106,7 @@ StrUpr (
VOID
StrCpy (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
)
// copy strings
{
@@ -116,7 +116,7 @@ StrCpy (
VOID
StrCat (
IN CHAR16 *Dest,
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
)
{
RtStrCat(Dest, Src);
@@ -124,7 +124,7 @@ StrCat (
UINTN
StrLen (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
)
// string length
{
@@ -133,7 +133,7 @@ StrLen (
UINTN
StrSize (
- IN CHAR16 *s1
+ IN CONST CHAR16 *s1
)
// string size
{
@@ -142,7 +142,7 @@ StrSize (
CHAR16 *
StrDuplicate (
- IN CHAR16 *Src
+ IN CONST CHAR16 *Src
)
// duplicate a string
{
@@ -159,7 +159,7 @@ StrDuplicate (
UINTN
strlena (
- IN CHAR8 *s1
+ IN CONST CHAR8 *s1
)
// string length
{
@@ -171,8 +171,8 @@ strlena (
UINTN
strcmpa (
- IN CHAR8 *s1,
- IN CHAR8 *s2
+ IN CONST CHAR8 *s1,
+ IN CONST CHAR8 *s2
)
// compare strings
{
@@ -190,8 +190,8 @@ strcmpa (
UINTN
strncmpa (
- IN CHAR8 *s1,
- IN CHAR8 *s2,
+ IN CONST CHAR8 *s1,
+ IN CONST CHAR8 *s2,
IN UINTN len
)
// compare strings
@@ -213,7 +213,7 @@ strncmpa (
UINTN
xtoi (
- CHAR16 *str
+ CONST CHAR16 *str
)
// convert hex string to uint
{
@@ -244,7 +244,7 @@ xtoi (
UINTN
Atoi (
- CHAR16 *str
+ CONST CHAR16 *str
)
// convert hex string to uint
{
generated by cgit (git 2.34.1) at 2024-05-03 04:29:27 +0000