* Code cleanup:
- remove trailing white space, trailing empty lines, C++ comments, etc.
- split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)
* Patches by Kenneth Johansson, 25 Jun 2003:
- major rework of command structure
(work done mostly by Michal Cendrowski and Joakim Kristiansen)
diff --git a/disk/part.c b/disk/part.c
index 70511ca..47dc39b 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -103,11 +103,10 @@
}
-
#if defined(CONFIG_MAC_PARTITION) || \
defined(CONFIG_DOS_PARTITION) || \
defined(CONFIG_ISO_PARTITION) || \
- defined(CONFIG_AMIGA_PARTITION)
+ defined(CONFIG_AMIGA_PARTITION)
void init_part (block_dev_desc_t * dev_desc)
{
diff --git a/disk/part_amiga.c b/disk/part_amiga.c
index aafbcd8..f1ad24a 100644
--- a/disk/part_amiga.c
+++ b/disk/part_amiga.c
@@ -1,6 +1,6 @@
/*
* (C) Copyright 2001
- * Hans-Joerg Frieden, Hyperion Entertainment
+ * Hans-Joerg Frieden, Hyperion Entertainment
* Hans-JoergF@hyperion-entertainment.com
*
* See file CREDITS for list of people who contributed to this
@@ -72,7 +72,7 @@
int len = *string++;
char buffer[256];
int i;
-
+
i = 0;
while (len)
{
@@ -97,7 +97,7 @@
for (i = 0; i < header->summed_longs; i++)
sum += *block++;
-
+
return (sum != 0);
}
@@ -126,12 +126,12 @@
static void print_part_info(struct partition_block *p)
{
struct amiga_part_geometry *g;
-
+
g = (struct amiga_part_geometry *)&(p->environment);
bstr_print(p->drive_name);
- printf("%6d\t%6d\t",
- g->low_cyl * g->block_per_track * g->surfaces ,
+ printf("%6d\t%6d\t",
+ g->low_cyl * g->block_per_track * g->surfaces ,
(g->high_cyl - g->low_cyl + 1) * g->block_per_track * g->surfaces - 1);
print_disk_type(g->dos_type);
printf("\t%5d\n", g->boot_priority);
@@ -178,7 +178,7 @@
return NULL;
}
-/*
+/*
* Search for boot code
* Again, the first boot block must be located somewhere in the first 16 blocks, or rooted in the
* Ridgid disk block
@@ -221,7 +221,7 @@
return 0;
}
-/*
+/*
* Test if the given partition has an Amiga partition table/Rigid
* Disk block
*/
@@ -231,7 +231,7 @@
struct bootcode_block *bootcode;
PRINTF("test_part_amiga: Testing for an Amiga RDB partition\n");
-
+
rdb = get_rdisk(dev_desc);
if (rdb)
{
@@ -243,7 +243,7 @@
return 0;
}
- else
+ else
{
PRINTF("test_part_amiga: no RDB found\n");
return -1;
@@ -251,7 +251,7 @@
}
-/*
+/*
* Find partition number partnum on the given drive.
*/
static struct partition_block *find_partition(block_dev_desc_t *dev_desc, int partnum)
@@ -262,12 +262,12 @@
PRINTF("Trying to find partition block %d\n", partnum);
rdb = get_rdisk(dev_desc);
- if (!rdb)
+ if (!rdb)
{
PRINTF("find_partition: no rdb found\n");
return NULL;
}
-
+
PRINTF("find_partition: Scanning partition list\n");
block = rdb->partition_list;
@@ -286,7 +286,7 @@
if (sum_block((struct block_header *)p) == 0)
{
if (partnum == 0) break;
- else
+ else
{
partnum--;
block = p->next;
@@ -296,7 +296,7 @@
} else block = 0xFFFFFFFF;
}
- if (block == 0xFFFFFFFF)
+ if (block == 0xFFFFFFFF)
{
PRINTF("PART block not found\n");
return NULL;
@@ -305,7 +305,7 @@
return (struct partition_block *)block_buffer;
}
-/*
+/*
* Get info about a partition
*/
int get_partition_info_amiga (block_dev_desc_t *dev_desc, int part, disk_partition_t *info)
@@ -321,7 +321,7 @@
info->size = (g->high_cyl - g->low_cyl + 1) * g->block_per_track * g->surfaces - 1;
info->blksz = rdb.block_bytes;
bcpl_strcpy(info->name, p->drive_name);
-
+
disk_type = g->dos_type;
@@ -331,12 +331,12 @@
info->type[3] = '\\';
info->type[4] = (disk_type & 0x000000FF) + '0';
info->type[5] = 0;
-
+
return 0;
}
void print_part_amiga (block_dev_desc_t *dev_desc)
-{
+{
struct rigid_disk_block *rdb;
struct bootcode_block *boot;
struct partition_block *p;
@@ -344,12 +344,12 @@
int i = 1;
rdb = get_rdisk(dev_desc);
- if (!rdb)
+ if (!rdb)
{
PRINTF("print_part_amiga: no rdb found\n");
return;
}
-
+
PRINTF("print_part_amiga: Scanning partition list\n");
block = rdb->partition_list;
@@ -370,7 +370,7 @@
ulong res;
PRINTF("Trying to load block #0x%X\n", block);
-
+
res = dev_desc->block_read(dev_desc->dev, block, 1,
(ulong *)block_buffer);
if (res == 1)
diff --git a/disk/part_amiga.h b/disk/part_amiga.h
index 9e59be9..20a8fdf 100644
--- a/disk/part_amiga.h
+++ b/disk/part_amiga.h
@@ -43,7 +43,7 @@
* "RigidDiskBlock".
*/
-struct rigid_disk_block
+struct rigid_disk_block
{
u32 id;
u32 summed_longs;
@@ -57,7 +57,7 @@
u32 drive_init;
u32 bootcode_block;
u32 reserved_1[5];
-
+
/* Physical drive geometry */
u32 cylinders;
u32 sectors;
@@ -79,14 +79,14 @@
u32 auto_park_seconds;
u32 high_rdsk_block;
u32 reserved_4;
-
+
char disk_vendor[8];
char disk_product[16];
char disk_revision[4];
char controller_vendor[8];
char controller_product[16];
char controller_revision[4];
-
+
u32 reserved_5[10];
};
@@ -94,7 +94,7 @@
* Each partition on this drive is defined by such a block
*/
-struct partition_block
+struct partition_block
{
u32 id;
u32 summed_longs;
@@ -110,7 +110,7 @@
u32 reserved_3[15];
};
-struct bootcode_block
+struct bootcode_block
{
u32 id;
u32 summed_longs;
@@ -125,12 +125,12 @@
#define AMIGA_ID_PART 0x50415254
#define AMIGA_ID_BOOT 0x424f4f54
-/*
+/*
* The environment array in the partition block
* describes the partition
*/
-struct amiga_part_geometry
+struct amiga_part_geometry
{
u32 table_size;
u32 size_blocks;
diff --git a/disk/part_dos.c b/disk/part_dos.c
index fc6769b..d585b35 100644
--- a/disk/part_dos.c
+++ b/disk/part_dos.c
@@ -67,7 +67,6 @@
}
-
int test_part_dos (block_dev_desc_t *dev_desc)
{
unsigned char buffer[DEFAULT_SECTOR_SIZE];
@@ -75,7 +74,7 @@
if ((dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) ||
(buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) ||
(buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) ) {
- return (-1);
+ return (-1);
}
return (0);
}
@@ -106,7 +105,7 @@
pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
for (i = 0; i < 4; i++, pt++) {
/*
- * fdisk does not show the extended partitions that
+ * fdisk does not show the extended partitions that
* are not in the MBR
*/
@@ -166,8 +165,8 @@
pt = (dos_partition_t *) (buffer + DOS_PART_TBL_OFFSET);
for (i = 0; i < 4; i++, pt++) {
/*
- * fdisk does not show the extended partitions that
- * are not in the MBR
+ * fdisk does not show the extended partitions that
+ * are not in the MBR
*/
if ((pt->sys_ind != 0) &&
(part_num == which_part) &&
@@ -231,5 +230,4 @@
}
-
#endif /* (CONFIG_COMMANDS & CFG_CMD_IDE) && CONFIG_DOS_PARTITION */
diff --git a/disk/part_iso.c b/disk/part_iso.c
index 7225927..4d746e4 100644
--- a/disk/part_iso.c
+++ b/disk/part_iso.c
@@ -230,7 +230,6 @@
}
-
void print_part_iso(block_dev_desc_t * dev_desc)
{
disk_partition_t info;
diff --git a/disk/part_iso.h b/disk/part_iso.h
index 34adbb2..2663578 100644
--- a/disk/part_iso.h
+++ b/disk/part_iso.h
@@ -127,8 +127,6 @@
}iso_part_rec_t;
-
-
typedef struct iso_val_entry {
unsigned char header_id; /* Header ID must be 0x01 */
unsigned char platform; /* Platform: 0=x86, 1=PowerPC, 2=MAC */
@@ -159,13 +157,4 @@
void print_partition_cd(int dev);
-
-
-
-
-
-
-
#endif /* _PART_CD_H */
-
-
diff --git a/disk/part_mac.c b/disk/part_mac.c
index ee9d170..087133d 100644
--- a/disk/part_mac.c
+++ b/disk/part_mac.c
@@ -190,9 +190,9 @@
for (;;) {
/*
- * We must always read the descritpor block for
- * partition 1 first since this is the only way to
- * know how many partitions we have.
+ * We must always read the descritpor block for
+ * partition 1 first since this is the only way to
+ * know how many partitions we have.
*/
if (dev_desc->block_read (dev_desc->dev, n, 1, (ulong *)pdb_p) != 1) {
printf ("** Can't read Partition Map on %d:%d **\n",
diff --git a/disk/part_mac.h b/disk/part_mac.h
index fb1edac..a7ad697 100644
--- a/disk/part_mac.h
+++ b/disk/part_mac.h
@@ -90,7 +90,7 @@
uchar processor[16]; /* Type of Processor */
__u16 part_pad[188]; /* reserved */
#ifdef CONFIG_ISO_PARTITION
- uchar iso_dummy[2048];/* Reservere enough room for an ISO partition block to fit */
+ uchar iso_dummy[2048];/* Reservere enough room for an ISO partition block to fit */
#endif
} mac_partition_t;