Skip to content

Commit

Permalink
. 支持位于 2TB 后的分区。改进 vol 函数。
Browse files Browse the repository at this point in the history
  • Loading branch information
yaya committed Jul 14, 2019
1 parent 2991553 commit 5f57a49
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 70 deletions.
3 changes: 3 additions & 0 deletions ChangeLog_chenall.txt
View file
@@ -1,4 +1,7 @@
更新说明：
2019-07-14(yaya)
支持位于 2TB 后的分区。

2019-06-13(yaya)
修正 color 函数。增加 --64bit 参数，用于指定 <=0xff 的值为 64 位颜色。
支持 15 位每像素图形模式(即5:5:5模式)。
Expand Down
12 changes: 6 additions & 6 deletions stage2/asm.S
View file
Expand Up @@ -17061,9 +17061,9 @@ VARIABLE(grub_putchar)
#define next_partition_dest ((*(unsigned long **)0x8304)[1])
#define next_partition_partition ((*(unsigned long ***)0x8304)[2])
#define next_partition_type ((*(unsigned long ***)0x8304)[3])
#define next_partition_start ((*(unsigned long ***)0x8304)[4])
#define next_partition_len ((*(unsigned long ***)0x8304)[5])
#define next_partition_offset ((*(unsigned long ***)0x8304)[6])
#define next_partition_start ((*(unsigned long long ***)0x8304)[2])
#define next_partition_len ((*(unsigned long long ***)0x8304)[3])
#define next_partition_offset ((*(unsigned long long ***)0x8304)[4])
#define next_partition_entry ((*(unsigned long ***)0x8304)[7])
#define next_partition_ext_offset ((*(unsigned long ***)0x8304)[8])
#define next_partition_buf ((*(char ***)0x8304)[9])
Expand All @@ -17081,11 +17081,11 @@ VARIABLE(next_partition_partition)
VARIABLE(next_partition_type)
.long 0
VARIABLE(next_partition_start)
.long 0
.long 0, 0
VARIABLE(next_partition_len)
.long 0
.long 0, 0
VARIABLE(next_partition_offset)
.long 0
.long 0, 0
VARIABLE(next_partition_entry)
.long 0
VARIABLE(next_partition_ext_offset)
Expand Down
93 changes: 49 additions & 44 deletions stage2/builtins.c
View file
Expand Up @@ -5533,17 +5533,6 @@ static struct builtin builtin_commandline =

extern int bsd_evil_hack;

extern unsigned long next_partition_drive;
extern unsigned long next_partition_dest;
extern unsigned long *next_partition_partition;
extern unsigned long *next_partition_type;
extern unsigned long *next_partition_start;
extern unsigned long *next_partition_len;
extern unsigned long *next_partition_offset;
extern unsigned long *next_partition_entry;
extern unsigned long *next_partition_ext_offset;
extern char *next_partition_buf;

//extern unsigned long dest_partition;
//static unsigned long entry;
//static unsigned long ext_offset;
Expand Down Expand Up @@ -5627,8 +5616,8 @@ static int
set_partition_hidden_flag (int hidden)
{
unsigned long part = 0xFFFFFF;
unsigned long start, len, offset, ext_offset1;
unsigned long type, entry1;
unsigned long long start, len, offset;
unsigned long type, entry1, ext_offset1;

#if 0
/* The drive must be a hard disk. */
Expand All @@ -5652,9 +5641,9 @@ set_partition_hidden_flag (int hidden)
next_partition_dest = current_partition,
next_partition_partition = &part,
next_partition_type = &type,
next_partition_start = &start,
next_partition_len = &len,
next_partition_offset = &offset,
next_partition_start = (unsigned long long *)(void *)&start,
next_partition_len = (unsigned long long *)(void *)&len,
next_partition_offset = (unsigned long long *)(void *)&offset,
next_partition_entry = &entry1,
next_partition_ext_offset = &ext_offset1,
next_partition_buf = mbr,
Expand Down Expand Up @@ -5956,8 +5945,8 @@ find_func (char *arg, int flags)
for (drive = (*devtype == 'h')?0x80:0; drive < FIND_DRIVES; drive++)
{
unsigned long part = 0xFFFFFF;
unsigned long start, len, offset, ext_offset1;
unsigned long type, entry1;
unsigned long long start, len, offset;
unsigned long type, entry1, ext_offset1;

saved_drive = current_drive = drive;
saved_partition = current_partition = part;
Expand All @@ -5980,9 +5969,9 @@ find_func (char *arg, int flags)
next_partition_dest = 0xFFFFFF,
next_partition_partition = &part,
next_partition_type = &type,
next_partition_start = &start,
next_partition_len = &len,
next_partition_offset = &offset,
next_partition_start = (unsigned long long *)(void *)&start,
next_partition_len = (unsigned long long *)(void *)&len,
next_partition_offset = (unsigned long long *)(void *)&offset,
next_partition_entry = &entry1,
next_partition_ext_offset = &ext_offset1,
next_partition_buf = mbr,
Expand Down Expand Up @@ -6809,22 +6798,38 @@ uuid_func (char *argument, int flags)
if (write)
return ! (errnum = ERR_BAD_ARGUMENT);
errnum = 0;
/* Search in hard disks first, since floppies are slow */

for (drive = 0; drive <= 0xff; drive++)
{
unsigned long part = 0xFFFFFF;
unsigned long start, len, offset, ext_offset1;
unsigned long type, entry1;
unsigned long long start, len, offset;
unsigned long type, entry1, ext_offset1;
int bsd_part;
int pc_slice;

if ((drive > 10 && drive < 0x80) || (drive > (*((char *)0x475) + 0x80) && drive < 0x9f))
continue;
// if ((drive > 10 && drive < 0x80) || (drive > (*((char *)0x475) + 0x80) && drive < 0x9f))
// continue;

for (i = 0; i < DRIVE_MAP_SIZE; i++)
{
if (drive_map_slot_empty (bios_drive_map[i]))
break;
if (bios_drive_map[i].from_drive == drive)
goto yyyyy;
}
#define FIND_HD (*((char *)0x475))
#define FIND_FD (((*(char*)0x410) & 1)?((*(char*)0x410) >> 6) + 1 : 0)
if (drive < FIND_FD || (drive >=0x80 && drive < 0x80 + FIND_HD))
#undef FIND_HD
#undef FIND_FD
goto yyyyy;
if (drive < 0x9f)
continue;
yyyyy:
saved_drive = current_drive = drive;
saved_partition = current_partition = part;

if (drive < 0x90 && grub_memcmp(fsys_table[fsys_type].name, "iso9660", 7) != 0)
if (drive < 0x9f && grub_memcmp(fsys_table[fsys_type].name, "iso9660", 7) != 0)
{
biosdisk_standard (0x02, (unsigned char)drive, 0, 0, 1, 1, 0x2F00);
if (!(probe_bpb((struct master_and_dos_boot_sector *)0x2f000)) && open_device())
Expand All @@ -6843,9 +6848,9 @@ uuid_func (char *argument, int flags)
next_partition_dest = 0xFFFFFF,
next_partition_partition = &part,
next_partition_type = &type,
next_partition_start = &start,
next_partition_len = &len,
next_partition_offset = &offset,
next_partition_start = (unsigned long long *)(void *)&start,
next_partition_len = (unsigned long long *)(void *)&len,
next_partition_offset = (unsigned long long *)(void *)&offset,
next_partition_entry = &entry1,
next_partition_ext_offset = &ext_offset1,
next_partition_buf = mbr,
Expand All @@ -6871,19 +6876,19 @@ uuid_func (char *argument, int flags)
}
if (! *arg)
{
grub_printf ("(%s%x%c%c%c%c):", ((drive<10)?"fd":(drive>=0x9f)?"0x":"hd"),((drive<10 || drive>=0x9f)?drive:(drive-0x80)), ((pc_slice==0xff)?'\0':','),((pc_slice==0xff)?'\0' :(pc_slice + '0')), ((bsd_part == 0xFF) ? '\0' : ','), ((bsd_part == 0xFF) ? '\0' : (bsd_part + 'a')));
grub_printf ("(%s%d%c%c%c%c):", ((drive<0x80)?"fd":(drive>=0x9f)?"":"hd"),((drive<0x80 || drive>=0x9f)?drive:(drive-0x80)), ((pc_slice==0xff)?'\0':','),((pc_slice==0xff)?'\0' :(pc_slice + '0')), ((bsd_part == 0xFF) ? '\0' : ','), ((bsd_part == 0xFF) ? '\0' : (bsd_part + 'a')));
if (*uuid_found || debug)
grub_printf("%s%s is \"%s\".\n\t", ((drive<10)?" ":(drive>=0x9f)?" ":" "), p, ((*uuid_found) ? uuid_found : "(unsupported)"));
grub_printf("%s%s is \"%s\".\n\t", ((drive<0x80)?" ":(drive>=0x9f)?" ":" "), p, ((*uuid_found) ? uuid_found : "(unsupported)"));
print_fsys_type();
}
else if (substring((char*)uuid_found,arg,1) == 0)
{
grub_sprintf(root_found,"(%s%x%c%c%c%c)", ((drive<10)?"fd":(drive>=0x9f)?"0x":"hd"),((drive<10 || drive>=0x9f)?drive:(drive-0x80)), ((pc_slice==0xff)?'\0':','),((pc_slice==0xff)?'\0' :(pc_slice + '0')), ((bsd_part == 0xFF) ? '\0' : ','), ((bsd_part == 0xFF) ? '\0' : (bsd_part + 'a')));
grub_sprintf(root_found,"(%s%d%c%c%c%c)", ((drive<0x80)?"fd":(drive>=0x9f)?"":"hd"),((drive<0x80 || drive>=0x9f)?drive:(drive-0x80)), ((pc_slice==0xff)?'\0':','),((pc_slice==0xff)?'\0' :(pc_slice + '0')), ((bsd_part == 0xFF) ? '\0' : ','), ((bsd_part == 0xFF) ? '\0' : (bsd_part + 'a')));
goto found;
}
}
}
if (drive > 0x8f)
if (drive >= 0x9f)
break;

/* We want to ignore any error here. */
Expand Down Expand Up @@ -11992,8 +11997,8 @@ parttype_func (char *arg, int flags)
{
unsigned long long new_type = -1;
unsigned long part = 0xFFFFFF;
unsigned long start, len, offset, ext_offset1;
unsigned long type, entry1;
unsigned long long start, len, offset;
unsigned long type, entry1, ext_offset1;

/* Get the drive and the partition. */

Expand Down Expand Up @@ -12038,9 +12043,9 @@ parttype_func (char *arg, int flags)
next_partition_dest = current_partition,
next_partition_partition = &part,
next_partition_type = &type,
next_partition_start = &start,
next_partition_len = &len,
next_partition_offset = &offset,
next_partition_start = (unsigned long long *)(void *)&start,
next_partition_len = (unsigned long long *)(void *)&len,
next_partition_offset = (unsigned long long *)(void *)&offset,
next_partition_entry = &entry1,
next_partition_ext_offset = &ext_offset1,
next_partition_buf = mbr,
Expand Down Expand Up @@ -13054,8 +13059,8 @@ real_root_func (char *arg, int attempt_mnt)
else if (grub_memcmp (arg, "endpart", 7) == 0)
{
unsigned long part = 0xFFFFFF;
unsigned long start, len, offset, ext_offset1;
unsigned long type, entry1;
unsigned long long start, len, offset;
unsigned long type, entry1, ext_offset1;

/* find MAX/END partition of the current root drive */

Expand All @@ -13079,9 +13084,9 @@ real_root_func (char *arg, int attempt_mnt)
next_partition_dest = 0xFFFFFF,
next_partition_partition = &part,
next_partition_type = &type,
next_partition_start = &start,
next_partition_len = &len,
next_partition_offset = &offset,
next_partition_start = (unsigned long long *)(void *)&start,
next_partition_len = (unsigned long long *)(void *)&len,
next_partition_offset = (unsigned long long *)(void *)&offset,
next_partition_entry = &entry1,
next_partition_ext_offset = &ext_offset1,
next_partition_buf = mbr,
Expand Down
27 changes: 8 additions & 19 deletions stage2/disk_io.c
View file
Expand Up @@ -70,9 +70,9 @@ int print_possibilities;

static int unique;
static char *unique_string;
static unsigned long cur_part_offset;
static unsigned long long cur_part_offset;
static unsigned long cur_part_addr;
static unsigned long cur_part_start;
static unsigned long long cur_part_start;
static unsigned long cur_part_entry;

static int do_completion;
Expand Down Expand Up @@ -102,19 +102,8 @@ part_choice;
*/
char *mbr = (char *)0x8000; /* 512-byte buffer for any use. */

extern unsigned long next_partition_drive;
extern unsigned long next_partition_dest;
extern unsigned long *next_partition_partition;
extern unsigned long *next_partition_type;
extern unsigned long *next_partition_start;
extern unsigned long *next_partition_len;
extern unsigned long *next_partition_offset;
extern unsigned long *next_partition_entry;
extern unsigned long *next_partition_ext_offset;
extern char *next_partition_buf;

static unsigned long dest_partition;
static unsigned long part_offset;
static unsigned long long part_offset;
static unsigned long entry;
static unsigned long ext_offset;

Expand Down Expand Up @@ -790,7 +779,7 @@ static int next_gpt_slice(void)
if (! rawread (next_partition_drive, sector,(pc_slice_no & 3) * sizeof(GPT_ENT) , sizeof(GPT_ENT), (unsigned long long)(unsigned int)next_partition_buf, 0xedde0d90))
return 0;
P_GPT_ENT PI = (P_GPT_ENT)(unsigned int)next_partition_buf;
if (PI->starting_lba == 0LL || PI->starting_lba > 0xFFFFFFFFL)
if (PI->starting_lba == 0LL /*|| PI->starting_lba > 0xFFFFFFFFL*/)
{
errnum = ERR_NO_PART;
return 0;
Expand All @@ -799,7 +788,7 @@ static int next_gpt_slice(void)
if (memcmp(PI->type.raw,"\x16\xE3\xC9\xE3\x5C\x0B\xB8\x4D\x81\x7D\xF9\x2D\xF0\x02\x15\xAE",16) == 0 && next_partition_dest == 0xffffff)
goto redo;
*next_partition_start = PI->starting_lba;
*next_partition_len = (unsigned long)(PI->ending_lba - PI->starting_lba + 1);
*next_partition_len = (unsigned long long)(PI->ending_lba - PI->starting_lba + 1);
*next_partition_partition = (pc_slice_no << 16) | 0xFFFF;
*next_partition_type = PC_SLICE_TYPE_GPT;
return 1;
Expand Down Expand Up @@ -1128,9 +1117,9 @@ next_part (void)
next_partition_dest = dest_partition;
next_partition_partition = &current_partition;
next_partition_type = &current_slice;
next_partition_start = (unsigned long *)(void *)&part_start;
next_partition_len = (unsigned long *)(void *)&part_length;
next_partition_offset = &part_offset;
next_partition_start = (unsigned long long *)(void *)&part_start;
next_partition_len = (unsigned long long *)(void *)&part_length;
next_partition_offset = (unsigned long long *)(void *)&part_offset;
next_partition_entry = &entry;
next_partition_ext_offset = &ext_offset;
next_partition_buf = mbr;
Expand Down
11 changes: 10 additions & 1 deletion stage2/shared.h
View file
Expand Up @@ -1770,7 +1770,16 @@ void ipxe_init(void);
#endif /* FSYS_PXE */

extern unsigned long fb_status;

extern unsigned long next_partition_drive;
extern unsigned long next_partition_dest;
extern unsigned long *next_partition_partition;
extern unsigned long *next_partition_type;
extern unsigned long long *next_partition_start;
extern unsigned long long *next_partition_len;
extern unsigned long long *next_partition_offset;
extern unsigned long *next_partition_entry;
extern unsigned long *next_partition_ext_offset;
extern char *next_partition_buf;
#endif /* ! ASM_FILE */

#endif /* ! GRUB_SHARED_HEADER */

0 comments on commit 5f57a49

Please sign in to comment.