Page MenuHomeFreeBSD
Files F102653631

D36569.diff
No OneTemporary
Actions

D36569.diff
View Options

diff --git a/stand/userboot/userboot/bootinfo.c b/stand/userboot/userboot/bootinfo.c
--- a/stand/userboot/userboot/bootinfo.c
+++ b/stand/userboot/userboot/bootinfo.c
@@ -96,18 +96,18 @@
/* traverse the environment */
for (ep = environ; ep != NULL; ep = ep->ev_next) {
- CALLBACK(copyin, ep->ev_name, addr, strlen(ep->ev_name));
+ archsw.arch_copyin(ep->ev_name, addr, strlen(ep->ev_name));
addr += strlen(ep->ev_name);
- CALLBACK(copyin, "=", addr, 1);
+ archsw.arch_copyin("=", addr, 1);
addr++;
if (ep->ev_value != NULL) {
- CALLBACK(copyin, ep->ev_value, addr, strlen(ep->ev_value));
+ archsw.arch_copyin(ep->ev_value, addr, strlen(ep->ev_value));
addr += strlen(ep->ev_value);
}
- CALLBACK(copyin, "", addr, 1);
+ archsw.arch_copyin("", addr, 1);
addr++;
}
- CALLBACK(copyin, "", addr, 1);
+ archsw.arch_copyin("", addr, 1);
addr++;
return(addr);
}
diff --git a/stand/userboot/userboot/bootinfo32.c b/stand/userboot/userboot/bootinfo32.c
--- a/stand/userboot/userboot/bootinfo32.c
+++ b/stand/userboot/userboot/bootinfo32.c
@@ -61,7 +61,7 @@
#define COPY32(v, a, c) { \
uint32_t x = (v); \
if (c) \
- CALLBACK(copyin, &x, a, sizeof(x)); \
+ archsw.arch_copyin(&x, a, sizeof(x)); \
a += sizeof(x); \
}
@@ -69,7 +69,7 @@
COPY32(t, a, c); \
COPY32(strlen(s) + 1, a, c); \
if (c) \
- CALLBACK(copyin, s, a, strlen(s) + 1); \
+ archsw.arch_copyin(s, a, strlen(s) + 1);\
a += roundup(strlen(s) + 1, sizeof(uint32_t));\
}
@@ -81,7 +81,7 @@
COPY32(t, a, c); \
COPY32(sizeof(s), a, c); \
if (c) \
- CALLBACK(copyin, &s, a, sizeof(s)); \
+ archsw.arch_copyin(&s, a, sizeof(s)); \
a += roundup(sizeof(s), sizeof(uint32_t)); \
}
@@ -92,7 +92,7 @@
COPY32(MODINFO_METADATA | mm->md_type, a, c); \
COPY32(mm->md_size, a, c); \
if (c) \
- CALLBACK(copyin, mm->md_data, a, mm->md_size); \
+ archsw.arch_copyin(mm->md_data, a, mm->md_size);\
a += roundup(mm->md_size, sizeof(uint32_t));\
}
diff --git a/stand/userboot/userboot/bootinfo64.c b/stand/userboot/userboot/bootinfo64.c
--- a/stand/userboot/userboot/bootinfo64.c
+++ b/stand/userboot/userboot/bootinfo64.c
@@ -58,7 +58,7 @@
#define COPY32(v, a, c) { \
uint32_t x = (v); \
if (c) \
- CALLBACK(copyin, &x, a, sizeof(x)); \
+ archsw.arch_copyin(&x, a, sizeof(x)); \
a += sizeof(x); \
}
@@ -66,7 +66,7 @@
COPY32(t, a, c); \
COPY32(strlen(s) + 1, a, c); \
if (c) \
- CALLBACK(copyin, s, a, strlen(s) + 1); \
+ archsw.arch_copyin(s, a, strlen(s) + 1);\
a += roundup(strlen(s) + 1, sizeof(uint64_t));\
}
@@ -78,7 +78,7 @@
COPY32(t, a, c); \
COPY32(sizeof(s), a, c); \
if (c) \
- CALLBACK(copyin, &s, a, sizeof(s)); \
+ archsw.arch_copyin(&s, a, sizeof(s)); \
a += roundup(sizeof(s), sizeof(uint64_t)); \
}
@@ -89,7 +89,7 @@
COPY32(MODINFO_METADATA | mm->md_type, a, c); \
COPY32(mm->md_size, a, c); \
if (c) \
- CALLBACK(copyin, mm->md_data, a, mm->md_size); \
+ archsw.arch_copyin(mm->md_data, a, mm->md_size);\
a += roundup(mm->md_size, sizeof(uint64_t));\
}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 16, 9:42 AM (16 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14656702
Default Alt Text
D36569.diff (3 KB)

Event Timeline