From: Ben Gras Date: Wed, 7 Sep 2005 10:04:48 +0000 (+0000) Subject: Provisionally removed the fake iso partitioning in favour of a real partition X-Git-Tag: v3.1.0~170 X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=075c219309c29ef6498f1159c2938690f111dfda;p=minix.git Provisionally removed the fake iso partitioning in favour of a real partition table on the boot CD --- diff --git a/drivers/libdriver/drvlib.c b/drivers/libdriver/drvlib.c index 31c165d32..34869dd86 100644 --- a/drivers/libdriver/drvlib.c +++ b/drivers/libdriver/drvlib.c @@ -15,8 +15,10 @@ FORWARD _PROTOTYPE( void extpartition, (struct driver *dp, int extdev, unsigned long extbase) ); FORWARD _PROTOTYPE( int get_part_table, (struct driver *dp, int device, unsigned long offset, struct part_entry *table, int *io) ); +#if DEAD_CODE FORWARD _PROTOTYPE( int get_iso_fake_part_table, (struct driver *dp, int device, unsigned long offset, struct part_entry *table) ); +#endif FORWARD _PROTOTYPE( void sort, (struct part_entry *table) ); /*============================================================================* @@ -47,10 +49,7 @@ int atapi; /* atapi device */ limit = base + div64u(dv->dv_size, SECTOR_SIZE); /* Read the partition table for the device. */ - if(atapi) { - if(!get_iso_fake_part_table(dp, device, 0L, table)) - return; - } else if(!get_part_table(dp, device, 0L, table, &io)) { + if(!get_part_table(dp, device, 0L, table, &io)) { return; } @@ -184,6 +183,7 @@ int *io_ok; return 1; } +#if DEAD_CODE /*============================================================================* * get_iso_fake_part_table * *============================================================================*/ @@ -237,6 +237,7 @@ struct part_entry *table; /* four entries */ /* Read the partition table at 'offset'. */ return 1; } +#endif /*===========================================================================* * sort *