Eric Lee / smarc-uboot | Embedian Git Server

Commit 8f7102cf6bf744cbd9bf0e7fd79a82aaea989f81

Authored by Shawn Guo 2017-11-02 16:46:34 +0800

Committed by Tom Rini 2017-11-06 22:59:01 +0800

Exists in smarc_8mq_lf_v2020.04 and in 17 other branches

disk: part_dos: fix part_get_info_extended() function

The check in part_get_info_extended() for a successful partition
searching misses a condition for extended partition. In case of
(ext_part_sector == 0), we should anyway mark the partition as found,
even if it's an extended partition, i.e. (is_extended(pt->sys_ind) == 0).
Otherwise, the extended partition (type 0x0f) will never be identified,
and the following recursive call to part_get_info_extended() will get a
wrong 'part_num' and 'which_part' parameter.  In the end, all those
partitions in extended table will not be identified.

Let's add the missing OR condition of (ext_part_sector == 0) for
is_extended() check to fix the problem.

The issue is discovered by running fastboot flash to an extended
partition on eMMC.

  $ fastboot flash mmcsda5 cache.img
  target reported max download size of 536870912 bytes
  sending 'mmcsda5' (18796 KB)...
  OKAY [  2.144s]
  writing 'mmcsda5'...
  FAILED (remote: cannot find partition)
  finished. total time: 2.261s

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

Showing 1 changed file with 1 additions and 1 deletions Inline Diff

disk/part_dos.c

disk/part_dos.c

Diff comments View file @ 8f7102c

1	/*	1	/*
2	* (C) Copyright 2001	2	* (C) Copyright 2001
3	* Raymond Lo, lo@routefree.com	3	* Raymond Lo, lo@routefree.com
4	* Wolfgang Denk, DENX Software Engineering, wd@denx.de.	4	* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
5	*	5	*
6	* SPDX-License-Identifier: GPL-2.0+	6	* SPDX-License-Identifier: GPL-2.0+
7	*/	7	*/
8		8
9	/*	9	/*
10	* Support for harddisk partitions.	10	* Support for harddisk partitions.
11	*	11	*
12	* To be compatible with LinuxPPC and Apple we use the standard Apple	12	* To be compatible with LinuxPPC and Apple we use the standard Apple
13	* SCSI disk partitioning scheme. For more information see:	13	* SCSI disk partitioning scheme. For more information see:
14	* http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92	14	* http://developer.apple.com/techpubs/mac/Devices/Devices-126.html#MARKER-14-92
15	*/	15	*/
16		16
17	#include <common.h>	17	#include <common.h>
18	#include <command.h>	18	#include <command.h>
19	#include <ide.h>	19	#include <ide.h>
20	#include <memalign.h>	20	#include <memalign.h>
21	#include "part_dos.h"	21	#include "part_dos.h"
22		22
23	#ifdef HAVE_BLOCK_DEVICE	23	#ifdef HAVE_BLOCK_DEVICE
24		24
25	#define DOS_PART_DEFAULT_SECTOR 512	25	#define DOS_PART_DEFAULT_SECTOR 512
26		26
27	/* Convert char[4] in little endian format to the host format integer	27	/* Convert char[4] in little endian format to the host format integer
28	*/	28	*/
29	static inline unsigned int le32_to_int(unsigned char *le32)	29	static inline unsigned int le32_to_int(unsigned char *le32)
30	{	30	{
31	return ((le32[3] << 24) +	31	return ((le32[3] << 24) +
32	(le32[2] << 16) +	32	(le32[2] << 16) +
33	(le32[1] << 8) +	33	(le32[1] << 8) +
34	le32[0]	34	le32[0]
35	);	35	);
36	}	36	}
37		37
38	static inline int is_extended(int part_type)	38	static inline int is_extended(int part_type)
39	{	39	{
40	return (part_type == 0x5 \|\|	40	return (part_type == 0x5 \|\|
41	part_type == 0xf \|\|	41	part_type == 0xf \|\|
42	part_type == 0x85);	42	part_type == 0x85);
43	}	43	}
44		44
45	static inline int is_bootable(dos_partition_t *p)	45	static inline int is_bootable(dos_partition_t *p)
46	{	46	{
47	return (p->sys_ind == 0xef) \|\| (p->boot_ind == 0x80);	47	return (p->sys_ind == 0xef) \|\| (p->boot_ind == 0x80);
48	}	48	}
49		49
50	static void print_one_part(dos_partition_t *p, lbaint_t ext_part_sector,	50	static void print_one_part(dos_partition_t *p, lbaint_t ext_part_sector,
51	int part_num, unsigned int disksig)	51	int part_num, unsigned int disksig)
52	{	52	{
53	lbaint_t lba_start = ext_part_sector + le32_to_int (p->start4);	53	lbaint_t lba_start = ext_part_sector + le32_to_int (p->start4);
54	lbaint_t lba_size = le32_to_int (p->size4);	54	lbaint_t lba_size = le32_to_int (p->size4);
55		55
56	printf("%3d\t%-10" LBAFlength "u\t%-10" LBAFlength	56	printf("%3d\t%-10" LBAFlength "u\t%-10" LBAFlength
57	"u\t%08x-%02x\t%02x%s%s\n",	57	"u\t%08x-%02x\t%02x%s%s\n",
58	part_num, lba_start, lba_size, disksig, part_num, p->sys_ind,	58	part_num, lba_start, lba_size, disksig, part_num, p->sys_ind,
59	(is_extended(p->sys_ind) ? " Extd" : ""),	59	(is_extended(p->sys_ind) ? " Extd" : ""),
60	(is_bootable(p) ? " Boot" : ""));	60	(is_bootable(p) ? " Boot" : ""));
61	}	61	}
62		62
63	static int test_block_type(unsigned char *buffer)	63	static int test_block_type(unsigned char *buffer)
64	{	64	{
65	int slot;	65	int slot;
66	struct dos_partition *p;	66	struct dos_partition *p;
67		67
68	if((buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) \|\|	68	if((buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) \|\|
69	(buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) ) {	69	(buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) ) {
70	return (-1);	70	return (-1);
71	} /* no DOS Signature at all */	71	} /* no DOS Signature at all */
72	p = (struct dos_partition *)&buffer[DOS_PART_TBL_OFFSET];	72	p = (struct dos_partition *)&buffer[DOS_PART_TBL_OFFSET];
73	for (slot = 0; slot < 3; slot++) {	73	for (slot = 0; slot < 3; slot++) {
74	if (p->boot_ind != 0 && p->boot_ind != 0x80) {	74	if (p->boot_ind != 0 && p->boot_ind != 0x80) {
75	if (!slot &&	75	if (!slot &&
76	(strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],	76	(strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],
77	"FAT", 3) == 0 \|\|	77	"FAT", 3) == 0 \|\|
78	strncmp((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET],	78	strncmp((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET],
79	"FAT32", 5) == 0)) {	79	"FAT32", 5) == 0)) {
80	return DOS_PBR; /* is PBR */	80	return DOS_PBR; /* is PBR */
81	} else {	81	} else {
82	return -1;	82	return -1;
83	}	83	}
84	}	84	}
85	}	85	}
86	return DOS_MBR; /* Is MBR */	86	return DOS_MBR; /* Is MBR */
87	}	87	}
88		88
89		89
90	static int part_test_dos(struct blk_desc *dev_desc)	90	static int part_test_dos(struct blk_desc *dev_desc)
91	{	91	{
92	#ifndef CONFIG_SPL_BUILD	92	#ifndef CONFIG_SPL_BUILD
93	ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz);	93	ALLOC_CACHE_ALIGN_BUFFER(legacy_mbr, mbr, dev_desc->blksz);
94		94
95	if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1)	95	if (blk_dread(dev_desc, 0, 1, (ulong *)mbr) != 1)
96	return -1;	96	return -1;
97		97
98	if (test_block_type((unsigned char *)mbr) != DOS_MBR)	98	if (test_block_type((unsigned char *)mbr) != DOS_MBR)
99	return -1;	99	return -1;
100		100
101	if (dev_desc->sig_type == SIG_TYPE_NONE &&	101	if (dev_desc->sig_type == SIG_TYPE_NONE &&
102	mbr->unique_mbr_signature != 0) {	102	mbr->unique_mbr_signature != 0) {
103	dev_desc->sig_type = SIG_TYPE_MBR;	103	dev_desc->sig_type = SIG_TYPE_MBR;
104	dev_desc->mbr_sig = mbr->unique_mbr_signature;	104	dev_desc->mbr_sig = mbr->unique_mbr_signature;
105	}	105	}
106	#else	106	#else
107	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);	107	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
108		108
109	if (blk_dread(dev_desc, 0, 1, (ulong *)buffer) != 1)	109	if (blk_dread(dev_desc, 0, 1, (ulong *)buffer) != 1)
110	return -1;	110	return -1;
111		111
112	if (test_block_type(buffer) != DOS_MBR)	112	if (test_block_type(buffer) != DOS_MBR)
113	return -1;	113	return -1;
114	#endif	114	#endif
115		115
116	return 0;	116	return 0;
117	}	117	}
118		118
119	/* Print a partition that is relative to its Extended partition table	119	/* Print a partition that is relative to its Extended partition table
120	*/	120	*/
121	static void print_partition_extended(struct blk_desc *dev_desc,	121	static void print_partition_extended(struct blk_desc *dev_desc,
122	lbaint_t ext_part_sector,	122	lbaint_t ext_part_sector,
123	lbaint_t relative,	123	lbaint_t relative,
124	int part_num, unsigned int disksig)	124	int part_num, unsigned int disksig)
125	{	125	{
126	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);	126	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
127	dos_partition_t *pt;	127	dos_partition_t *pt;
128	int i;	128	int i;
129		129
130	if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {	130	if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
131	printf (" Can't read partition table on %d:" LBAFU " \n",	131	printf (" Can't read partition table on %d:" LBAFU " \n",
132	dev_desc->devnum, ext_part_sector);	132	dev_desc->devnum, ext_part_sector);
133	return;	133	return;
134	}	134	}
135	i=test_block_type(buffer);	135	i=test_block_type(buffer);
136	if (i != DOS_MBR) {	136	if (i != DOS_MBR) {
137	printf ("bad MBR sector signature 0x%02x%02x\n",	137	printf ("bad MBR sector signature 0x%02x%02x\n",
138	buffer[DOS_PART_MAGIC_OFFSET],	138	buffer[DOS_PART_MAGIC_OFFSET],
139	buffer[DOS_PART_MAGIC_OFFSET + 1]);	139	buffer[DOS_PART_MAGIC_OFFSET + 1]);
140	return;	140	return;
141	}	141	}
142		142
143	if (!ext_part_sector)	143	if (!ext_part_sector)
144	disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]);	144	disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]);
145		145
146	/* Print all primary/logical partitions */	146	/* Print all primary/logical partitions */
147	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);	147	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
148	for (i = 0; i < 4; i++, pt++) {	148	for (i = 0; i < 4; i++, pt++) {
149	/*	149	/*
150	* fdisk does not show the extended partitions that	150	* fdisk does not show the extended partitions that
151	* are not in the MBR	151	* are not in the MBR
152	*/	152	*/
153		153
154	if ((pt->sys_ind != 0) &&	154	if ((pt->sys_ind != 0) &&
155	(ext_part_sector == 0 \|\| !is_extended (pt->sys_ind)) ) {	155	(ext_part_sector == 0 \|\| !is_extended (pt->sys_ind)) ) {
156	print_one_part(pt, ext_part_sector, part_num, disksig);	156	print_one_part(pt, ext_part_sector, part_num, disksig);
157	}	157	}
158		158
159	/* Reverse engr the fdisk part# assignment rule! */	159	/* Reverse engr the fdisk part# assignment rule! */
160	if ((ext_part_sector == 0) \|\|	160	if ((ext_part_sector == 0) \|\|
161	(pt->sys_ind != 0 && !is_extended (pt->sys_ind)) ) {	161	(pt->sys_ind != 0 && !is_extended (pt->sys_ind)) ) {
162	part_num++;	162	part_num++;
163	}	163	}
164	}	164	}
165		165
166	/* Follows the extended partitions */	166	/* Follows the extended partitions */
167	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);	167	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
168	for (i = 0; i < 4; i++, pt++) {	168	for (i = 0; i < 4; i++, pt++) {
169	if (is_extended (pt->sys_ind)) {	169	if (is_extended (pt->sys_ind)) {
170	lbaint_t lba_start	170	lbaint_t lba_start
171	= le32_to_int (pt->start4) + relative;	171	= le32_to_int (pt->start4) + relative;
172		172
173	print_partition_extended(dev_desc, lba_start,	173	print_partition_extended(dev_desc, lba_start,
174	ext_part_sector == 0 ? lba_start : relative,	174	ext_part_sector == 0 ? lba_start : relative,
175	part_num, disksig);	175	part_num, disksig);
176	}	176	}
177	}	177	}
178		178
179	return;	179	return;
180	}	180	}
181		181
182		182
183	/* Print a partition that is relative to its Extended partition table	183	/* Print a partition that is relative to its Extended partition table
184	*/	184	*/
185	static int part_get_info_extended(struct blk_desc *dev_desc,	185	static int part_get_info_extended(struct blk_desc *dev_desc,
186	lbaint_t ext_part_sector, lbaint_t relative,	186	lbaint_t ext_part_sector, lbaint_t relative,
187	int part_num, int which_part,	187	int part_num, int which_part,
188	disk_partition_t *info, unsigned int disksig)	188	disk_partition_t *info, unsigned int disksig)
189	{	189	{
190	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);	190	ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buffer, dev_desc->blksz);
191	dos_partition_t *pt;	191	dos_partition_t *pt;
192	int i;	192	int i;
193	int dos_type;	193	int dos_type;
194		194
195	if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {	195	if (blk_dread(dev_desc, ext_part_sector, 1, (ulong *)buffer) != 1) {
196	printf (" Can't read partition table on %d:" LBAFU " \n",	196	printf (" Can't read partition table on %d:" LBAFU " \n",
197	dev_desc->devnum, ext_part_sector);	197	dev_desc->devnum, ext_part_sector);
198	return -1;	198	return -1;
199	}	199	}
200	if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 \|\|	200	if (buffer[DOS_PART_MAGIC_OFFSET] != 0x55 \|\|
201	buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) {	201	buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) {
202	printf ("bad MBR sector signature 0x%02x%02x\n",	202	printf ("bad MBR sector signature 0x%02x%02x\n",
203	buffer[DOS_PART_MAGIC_OFFSET],	203	buffer[DOS_PART_MAGIC_OFFSET],
204	buffer[DOS_PART_MAGIC_OFFSET + 1]);	204	buffer[DOS_PART_MAGIC_OFFSET + 1]);
205	return -1;	205	return -1;
206	}	206	}
207		207
208	#if CONFIG_IS_ENABLED(PARTITION_UUIDS)	208	#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
209	if (!ext_part_sector)	209	if (!ext_part_sector)
210	disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]);	210	disksig = le32_to_int(&buffer[DOS_PART_DISKSIG_OFFSET]);
211	#endif	211	#endif
212		212
213	/* Print all primary/logical partitions */	213	/* Print all primary/logical partitions */
214	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);	214	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
215	for (i = 0; i < 4; i++, pt++) {	215	for (i = 0; i < 4; i++, pt++) {
216	/*	216	/*
217	* fdisk does not show the extended partitions that	217	* fdisk does not show the extended partitions that
218	* are not in the MBR	218	* are not in the MBR
219	*/	219	*/
220	if (((pt->boot_ind & ~0x80) == 0) &&	220	if (((pt->boot_ind & ~0x80) == 0) &&
221	(pt->sys_ind != 0) &&	221	(pt->sys_ind != 0) &&
222	(part_num == which_part) &&	222	(part_num == which_part) &&
223	(is_extended(pt->sys_ind) == 0)) {	223	(ext_part_sector == 0 \|\| is_extended(pt->sys_ind) == 0)) {
224	info->blksz = DOS_PART_DEFAULT_SECTOR;	224	info->blksz = DOS_PART_DEFAULT_SECTOR;
225	info->start = (lbaint_t)(ext_part_sector +	225	info->start = (lbaint_t)(ext_part_sector +
226	le32_to_int(pt->start4));	226	le32_to_int(pt->start4));
227	info->size = (lbaint_t)le32_to_int(pt->size4);	227	info->size = (lbaint_t)le32_to_int(pt->size4);
228	part_set_generic_name(dev_desc, part_num,	228	part_set_generic_name(dev_desc, part_num,
229	(char *)info->name);	229	(char *)info->name);
230	/* sprintf(info->type, "%d, pt->sys_ind); */	230	/* sprintf(info->type, "%d, pt->sys_ind); */
231	strcpy((char *)info->type, "U-Boot");	231	strcpy((char *)info->type, "U-Boot");
232	info->bootable = is_bootable(pt);	232	info->bootable = is_bootable(pt);
233	#if CONFIG_IS_ENABLED(PARTITION_UUIDS)	233	#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
234	sprintf(info->uuid, "%08x-%02x", disksig, part_num);	234	sprintf(info->uuid, "%08x-%02x", disksig, part_num);
235	#endif	235	#endif
236	info->sys_ind = pt->sys_ind;	236	info->sys_ind = pt->sys_ind;
237	return 0;	237	return 0;
238	}	238	}
239		239
240	/* Reverse engr the fdisk part# assignment rule! */	240	/* Reverse engr the fdisk part# assignment rule! */
241	if ((ext_part_sector == 0) \|\|	241	if ((ext_part_sector == 0) \|\|
242	(pt->sys_ind != 0 && !is_extended (pt->sys_ind)) ) {	242	(pt->sys_ind != 0 && !is_extended (pt->sys_ind)) ) {
243	part_num++;	243	part_num++;
244	}	244	}
245	}	245	}
246		246
247	/* Follows the extended partitions */	247	/* Follows the extended partitions */
248	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);	248	pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
249	for (i = 0; i < 4; i++, pt++) {	249	for (i = 0; i < 4; i++, pt++) {
250	if (is_extended (pt->sys_ind)) {	250	if (is_extended (pt->sys_ind)) {
251	lbaint_t lba_start	251	lbaint_t lba_start
252	= le32_to_int (pt->start4) + relative;	252	= le32_to_int (pt->start4) + relative;
253		253
254	return part_get_info_extended(dev_desc, lba_start,	254	return part_get_info_extended(dev_desc, lba_start,
255	ext_part_sector == 0 ? lba_start : relative,	255	ext_part_sector == 0 ? lba_start : relative,
256	part_num, which_part, info, disksig);	256	part_num, which_part, info, disksig);
257	}	257	}
258	}	258	}
259		259
260	/* Check for DOS PBR if no partition is found */	260	/* Check for DOS PBR if no partition is found */
261	dos_type = test_block_type(buffer);	261	dos_type = test_block_type(buffer);
262		262
263	if (dos_type == DOS_PBR) {	263	if (dos_type == DOS_PBR) {
264	info->start = 0;	264	info->start = 0;
265	info->size = dev_desc->lba;	265	info->size = dev_desc->lba;
266	info->blksz = DOS_PART_DEFAULT_SECTOR;	266	info->blksz = DOS_PART_DEFAULT_SECTOR;
267	info->bootable = 0;	267	info->bootable = 0;
268	strcpy((char *)info->type, "U-Boot");	268	strcpy((char *)info->type, "U-Boot");
269	#if CONFIG_IS_ENABLED(PARTITION_UUIDS)	269	#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
270	info->uuid[0] = 0;	270	info->uuid[0] = 0;
271	#endif	271	#endif
272	return 0;	272	return 0;
273	}	273	}
274		274
275	return -1;	275	return -1;
276	}	276	}
277		277
278	void part_print_dos(struct blk_desc *dev_desc)	278	void part_print_dos(struct blk_desc *dev_desc)
279	{	279	{
280	printf("Part\tStart Sector\tNum Sectors\tUUID\t\tType\n");	280	printf("Part\tStart Sector\tNum Sectors\tUUID\t\tType\n");
281	print_partition_extended(dev_desc, 0, 0, 1, 0);	281	print_partition_extended(dev_desc, 0, 0, 1, 0);
282	}	282	}
283		283
284	int part_get_info_dos(struct blk_desc *dev_desc, int part,	284	int part_get_info_dos(struct blk_desc *dev_desc, int part,
285	disk_partition_t *info)	285	disk_partition_t *info)
286	{	286	{
287	return part_get_info_extended(dev_desc, 0, 0, 1, part, info, 0);	287	return part_get_info_extended(dev_desc, 0, 0, 1, part, info, 0);
288	}	288	}
289		289
290	int is_valid_dos_buf(void *buf)	290	int is_valid_dos_buf(void *buf)
291	{	291	{
292	return test_block_type(buf) == DOS_MBR ? 0 : -1;	292	return test_block_type(buf) == DOS_MBR ? 0 : -1;
293	}	293	}
294		294
295	int write_mbr_partition(struct blk_desc dev_desc, void buf)	295	int write_mbr_partition(struct blk_desc dev_desc, void buf)
296	{	296	{
297	if (is_valid_dos_buf(buf))	297	if (is_valid_dos_buf(buf))
298	return -1;	298	return -1;
299		299
300	/* write MBR */	300	/* write MBR */
301	if (blk_dwrite(dev_desc, 0, 1, buf) != 1) {	301	if (blk_dwrite(dev_desc, 0, 1, buf) != 1) {
302	printf("%s: failed writing '%s' (1 blks at 0x0)\n",	302	printf("%s: failed writing '%s' (1 blks at 0x0)\n",
303	__func__, "MBR");	303	__func__, "MBR");
304	return 1;	304	return 1;
305	}	305	}
306		306
307	return 0;	307	return 0;
308	}	308	}
309		309
310	U_BOOT_PART_TYPE(dos) = {	310	U_BOOT_PART_TYPE(dos) = {
311	.name = "DOS",	311	.name = "DOS",
312	.part_type = PART_TYPE_DOS,	312	.part_type = PART_TYPE_DOS,
313	.max_entries = DOS_ENTRY_NUMBERS,	313	.max_entries = DOS_ENTRY_NUMBERS,
314	.get_info = part_get_info_ptr(part_get_info_dos),	314	.get_info = part_get_info_ptr(part_get_info_dos),
315	.print = part_print_ptr(part_print_dos),	315	.print = part_print_ptr(part_print_dos),
316	.test = part_test_dos,	316	.test = part_test_dos,
317	};	317	};
318		318
319	#endif	319	#endif
320		320