remove all trailing whitespace
This commit is contained in:
fzielcke
parent
d2d4966571
commit
b39f9d20a9
222 changed files with 3286 additions and 3286 deletions
66
mmap/mmap.c
66
mmap/mmap.c
|
|
@ -33,14 +33,14 @@ static int curhandle = 1;
|
|||
#endif
|
||||
|
||||
grub_err_t
|
||||
grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
||||
grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
||||
grub_uint64_t, grub_uint32_t))
|
||||
{
|
||||
|
||||
/* This function resolves overlapping regions and sorts the memory map.
|
||||
It uses scanline (sweeping) algorithm.
|
||||
*/
|
||||
/* If same page is used by multiple types it's resolved
|
||||
/* If same page is used by multiple types it's resolved
|
||||
according to priority:
|
||||
1 - free memory
|
||||
2 - memory usable by firmware-aware code
|
||||
|
|
@ -92,11 +92,11 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
/* Number of mmap chunks. */
|
||||
int mmap_num;
|
||||
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
struct grub_mmap_region *cur;
|
||||
#endif
|
||||
|
||||
auto int NESTED_FUNC_ATTR count_hook (grub_uint64_t, grub_uint64_t,
|
||||
|
||||
auto int NESTED_FUNC_ATTR count_hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_uint32_t);
|
||||
int NESTED_FUNC_ATTR count_hook (grub_uint64_t addr __attribute__ ((unused)),
|
||||
grub_uint64_t size __attribute__ ((unused)),
|
||||
|
|
@ -106,7 +106,7 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
return 0;
|
||||
}
|
||||
|
||||
auto int NESTED_FUNC_ATTR fill_hook (grub_uint64_t, grub_uint64_t,
|
||||
auto int NESTED_FUNC_ATTR fill_hook (grub_uint64_t, grub_uint64_t,
|
||||
grub_uint32_t);
|
||||
int NESTED_FUNC_ATTR fill_hook (grub_uint64_t addr,
|
||||
grub_uint64_t size,
|
||||
|
|
@ -131,35 +131,35 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
mmap_num = 0;
|
||||
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
for (cur = grub_mmap_overlays; cur; cur = cur->next)
|
||||
mmap_num++;
|
||||
#endif
|
||||
|
||||
grub_machine_mmap_iterate (count_hook);
|
||||
|
||||
|
||||
/* Initialize variables. */
|
||||
grub_memset (present, 0, sizeof (present));
|
||||
scanline_events = (struct grub_mmap_scan *)
|
||||
scanline_events = (struct grub_mmap_scan *)
|
||||
grub_malloc (sizeof (struct grub_mmap_scan) * 2 * mmap_num);
|
||||
|
||||
|
||||
if (! scanline_events)
|
||||
{
|
||||
return grub_error (GRUB_ERR_OUT_OF_MEMORY,
|
||||
return grub_error (GRUB_ERR_OUT_OF_MEMORY,
|
||||
"couldn't allocate space for new memory map");
|
||||
}
|
||||
|
||||
i = 0;
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
/* Register scanline events. */
|
||||
for (cur = grub_mmap_overlays; cur; cur = cur->next)
|
||||
{
|
||||
scanline_events[i].pos = cur->start;
|
||||
scanline_events[i].type = 0;
|
||||
if (cur->type == GRUB_MACHINE_MEMORY_HOLE
|
||||
if (cur->type == GRUB_MACHINE_MEMORY_HOLE
|
||||
|| (cur->type >= 0 && cur->type <= GRUB_MACHINE_MEMORY_MAX_TYPE
|
||||
&& priority[cur->type]))
|
||||
scanline_events[i].memtype = cur->type;
|
||||
|
|
@ -176,8 +176,8 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
|
||||
grub_machine_mmap_iterate (fill_hook);
|
||||
|
||||
/* Primitive bubble sort. It has complexity O(n^2) but since we're
|
||||
unlikely to have more than 100 chunks it's probably one of the
|
||||
/* Primitive bubble sort. It has complexity O(n^2) but since we're
|
||||
unlikely to have more than 100 chunks it's probably one of the
|
||||
fastest for one purpose. */
|
||||
done = 1;
|
||||
while (done)
|
||||
|
|
@ -186,7 +186,7 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
for (i = 0; i < 2 * mmap_num - 1; i++)
|
||||
if (scanline_events[i + 1].pos < scanline_events[i].pos
|
||||
|| (scanline_events[i + 1].pos == scanline_events[i].pos
|
||||
&& scanline_events[i + 1].type == 0
|
||||
&& scanline_events[i + 1].type == 0
|
||||
&& scanline_events[i].type == 1))
|
||||
{
|
||||
t = scanline_events[i + 1];
|
||||
|
|
@ -213,7 +213,7 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
curtype = k;
|
||||
|
||||
/* Announce region to the hook if necessary. */
|
||||
if ((curtype == -1 || curtype != lasttype)
|
||||
if ((curtype == -1 || curtype != lasttype)
|
||||
&& lastaddr != scanline_events[i].pos
|
||||
&& lasttype != -1
|
||||
&& lasttype != GRUB_MACHINE_MEMORY_HOLE
|
||||
|
|
@ -224,7 +224,7 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
}
|
||||
|
||||
/* Update last values if necessary. */
|
||||
if (curtype == -1 || curtype != lasttype)
|
||||
if (curtype == -1 || curtype != lasttype)
|
||||
{
|
||||
lasttype = curtype;
|
||||
lastaddr = scanline_events[i].pos;
|
||||
|
|
@ -235,7 +235,7 @@ grub_mmap_iterate (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t,
|
|||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
#ifndef GRUB_MMAP_REGISTER_BY_FIRMWARE
|
||||
int
|
||||
grub_mmap_register (grub_uint64_t start, grub_uint64_t size, int type)
|
||||
{
|
||||
|
|
@ -243,11 +243,11 @@ grub_mmap_register (grub_uint64_t start, grub_uint64_t size, int type)
|
|||
|
||||
grub_dprintf ("mmap", "registering\n");
|
||||
|
||||
cur = (struct grub_mmap_region *)
|
||||
cur = (struct grub_mmap_region *)
|
||||
grub_malloc (sizeof (struct grub_mmap_region));
|
||||
if (! cur)
|
||||
{
|
||||
grub_error (GRUB_ERR_OUT_OF_MEMORY,
|
||||
grub_error (GRUB_ERR_OUT_OF_MEMORY,
|
||||
"couldn't allocate memory map overlay");
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -295,7 +295,7 @@ grub_mmap_unregister (int handle)
|
|||
|
||||
#define CHUNK_SIZE 0x400
|
||||
|
||||
static inline grub_uint64_t
|
||||
static inline grub_uint64_t
|
||||
fill_mask (grub_uint64_t addr, grub_uint64_t mask, grub_uint64_t iterator)
|
||||
{
|
||||
int i, j;
|
||||
|
|
@ -324,15 +324,15 @@ grub_cmd_badram (grub_command_t cmd __attribute__ ((unused)),
|
|||
grub_uint64_t badaddr, badmask;
|
||||
|
||||
auto int NESTED_FUNC_ATTR hook (grub_uint64_t, grub_uint64_t, grub_uint32_t);
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr,
|
||||
grub_uint64_t size,
|
||||
int NESTED_FUNC_ATTR hook (grub_uint64_t addr,
|
||||
grub_uint64_t size,
|
||||
grub_uint32_t type __attribute__ ((unused)))
|
||||
{
|
||||
grub_uint64_t iterator, low, high, cur;
|
||||
int tail, var;
|
||||
int i;
|
||||
grub_dprintf ("badram", "hook %llx+%llx\n", (unsigned long long) addr,
|
||||
(unsigned long long) size);
|
||||
grub_dprintf ("badram", "hook %llx+%llx\n", (unsigned long long) addr,
|
||||
(unsigned long long) size);
|
||||
|
||||
/* How many trailing zeros? */
|
||||
for (tail = 0; ! (badmask & (1ULL << tail)); tail++);
|
||||
|
|
@ -349,7 +349,7 @@ grub_cmd_badram (grub_command_t cmd __attribute__ ((unused)),
|
|||
{
|
||||
low = 0;
|
||||
high = ~0ULL;
|
||||
/* Find starting value. Keep low and high such that
|
||||
/* Find starting value. Keep low and high such that
|
||||
fill_mask (low) < addr and fill_mask (high) >= addr;
|
||||
*/
|
||||
while (high - low > 1)
|
||||
|
|
@ -364,11 +364,11 @@ grub_cmd_badram (grub_command_t cmd __attribute__ ((unused)),
|
|||
}
|
||||
|
||||
for (; iterator < (1ULL << (var - tail))
|
||||
&& (cur = fill_mask (badaddr, badmask, iterator)) < addr + size;
|
||||
&& (cur = fill_mask (badaddr, badmask, iterator)) < addr + size;
|
||||
iterator++)
|
||||
{
|
||||
grub_dprintf ("badram", "%llx (size %llx) is a badram range\n",
|
||||
(long long) cur, (long long) (1ULL << tail) - 1);
|
||||
grub_dprintf ("badram", "%llx (size %llx) is a badram range\n",
|
||||
(long long) cur, (long long) (1ULL << tail) - 1);
|
||||
grub_mmap_register (cur, (1ULL << tail) - 1, GRUB_MACHINE_MEMORY_HOLE);
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -401,7 +401,7 @@ grub_cmd_badram (grub_command_t cmd __attribute__ ((unused)),
|
|||
no point in providing sub-page chunks. */
|
||||
badmask &= ~(CHUNK_SIZE - 1);
|
||||
|
||||
grub_dprintf ("badram", "badram %llx:%llx\n",
|
||||
grub_dprintf ("badram", "badram %llx:%llx\n",
|
||||
(unsigned long long) badaddr, (unsigned long long) badmask);
|
||||
|
||||
grub_mmap_iterate (hook);
|
||||
|
|
@ -414,7 +414,7 @@ static grub_command_t cmd;
|
|||
GRUB_MOD_INIT(mmap)
|
||||
{
|
||||
cmd = grub_register_command ("badram", grub_cmd_badram,
|
||||
"badram ADDR1,MASK1[,ADDR2,MASK2[,...]]",
|
||||
"badram ADDR1,MASK1[,ADDR2,MASK2[,...]]",
|
||||
"declare memory regions as badram");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue