* 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/fs/fdos/dev.c b/fs/fdos/dev.c
index 809156a..5dea5cd 100644
--- a/fs/fdos/dev.c
+++ b/fs/fdos/dev.c
@@ -38,7 +38,7 @@
static int lastwhere;
/*-----------------------------------------------------------------------------
- * dev_open --
+ * dev_open --
*-----------------------------------------------------------------------------
*/
int dev_open (void)
@@ -57,17 +57,17 @@
/* Si on ne desire pas lire a la position courante, il faut un seek */
if (where != lastwhere) {
- if (!fdc_fdos_seek (where)) {
- PRINTF ("seek error in dev_read");
- lastwhere = -1;
- return (-1);
- }
+ if (!fdc_fdos_seek (where)) {
+ PRINTF ("seek error in dev_read");
+ lastwhere = -1;
+ return (-1);
+ }
}
-
+
if (!fdc_fdos_read (buffer, len)) {
- PRINTF ("read error\n");
- lastwhere = -1;
- return (-1);
+ PRINTF ("read error\n");
+ lastwhere = -1;
+ return (-1);
}
lastwhere = where + len;
return (0);
@@ -84,110 +84,110 @@
/* Display Boot header */
PRINTF ("Jump to boot code 0x%02x 0x%02x 0x%02x\n",
- boot -> jump [0], boot -> jump [1], boot -> jump[2]);
+ boot -> jump [0], boot -> jump [1], boot -> jump[2]);
PRINTF ("OEM name & version '%*.*s'\n",
- BANNER_LG, BANNER_LG, boot -> banner );
+ BANNER_LG, BANNER_LG, boot -> banner );
PRINTF ("Bytes per sector hopefully 512 %d\n",
- __le16_to_cpu (boot -> secsiz));
+ __le16_to_cpu (boot -> secsiz));
PRINTF ("Cluster size in sectors %d\n",
- boot -> clsiz);
+ boot -> clsiz);
PRINTF ("Number of reserved (boot) sectors %d\n",
- __le16_to_cpu (boot -> nrsvsect));
+ __le16_to_cpu (boot -> nrsvsect));
PRINTF ("Number of FAT tables hopefully 2 %d\n",
- boot -> nfat);
+ boot -> nfat);
PRINTF ("Number of directory slots %d\n",
- __le16_to_cpu (boot -> dirents));
+ __le16_to_cpu (boot -> dirents));
PRINTF ("Total sectors on disk %d\n",
- __le16_to_cpu (boot -> psect));
+ __le16_to_cpu (boot -> psect));
PRINTF ("Media descriptor=first byte of FAT %d\n",
- boot -> descr);
+ boot -> descr);
PRINTF ("Sectors in FAT %d\n",
- __le16_to_cpu (boot -> fatlen));
+ __le16_to_cpu (boot -> fatlen));
PRINTF ("Sectors/track %d\n",
- __le16_to_cpu (boot -> nsect));
+ __le16_to_cpu (boot -> nsect));
PRINTF ("Heads %d\n",
- __le16_to_cpu (boot -> nheads));
+ __le16_to_cpu (boot -> nheads));
PRINTF ("number of hidden sectors %d\n",
- __le32_to_cpu (boot -> nhs));
+ __le32_to_cpu (boot -> nhs));
PRINTF ("big total sectors %d\n",
- __le32_to_cpu (boot -> bigsect));
+ __le32_to_cpu (boot -> bigsect));
PRINTF ("physical drive ? %d\n",
- boot -> physdrive);
+ boot -> physdrive);
PRINTF ("reserved %d\n",
- boot -> reserved);
+ boot -> reserved);
PRINTF ("dos > 4.0 diskette %d\n",
- boot -> dos4);
+ boot -> dos4);
PRINTF ("serial number %d\n",
- __le32_to_cpu (boot -> serial));
+ __le32_to_cpu (boot -> serial));
PRINTF ("disk label %*.*s\n",
- LABEL_LG, LABEL_LG, boot -> label);
+ LABEL_LG, LABEL_LG, boot -> label);
PRINTF ("FAT type %8.8s\n",
- boot -> fat_type);
+ boot -> fat_type);
PRINTF ("reserved by 2M %d\n",
- boot -> res_2m);
+ boot -> res_2m);
PRINTF ("2M checksum (not used) %d\n",
- boot -> CheckSum);
+ boot -> CheckSum);
PRINTF ("2MF format version %d\n",
- boot -> fmt_2mf);
+ boot -> fmt_2mf);
PRINTF ("1 if write track after format %d\n",
- boot -> wt);
+ boot -> wt);
PRINTF ("data transfer rate on track 0 %d\n",
- boot -> rate_0);
+ boot -> rate_0);
PRINTF ("data transfer rate on track<>0 %d\n",
- boot -> rate_any);
+ boot -> rate_any);
PRINTF ("offset to boot program %d\n",
- __le16_to_cpu (boot -> BootP));
+ __le16_to_cpu (boot -> BootP));
PRINTF ("T1: information for track 0 %d\n",
- __le16_to_cpu (boot -> Infp0));
+ __le16_to_cpu (boot -> Infp0));
PRINTF ("T2: information for track<>0 %d\n",
- __le16_to_cpu (boot -> InfpX));
+ __le16_to_cpu (boot -> InfpX));
PRINTF ("T3: track sectors size table %d\n",
- __le16_to_cpu (boot -> InfTm));
+ __le16_to_cpu (boot -> InfTm));
PRINTF ("Format date 0x%04x\n",
- __le16_to_cpu (boot -> DateF));
+ __le16_to_cpu (boot -> DateF));
PRINTF ("Format time 0x%04x\n",
- __le16_to_cpu (boot -> TimeF));
-
+ __le16_to_cpu (boot -> TimeF));
+
/* information is extracted from boot sector */
heads = __le16_to_cpu (boot -> nheads);
sectors = __le16_to_cpu (boot -> nsect);
fs -> tot_sectors = __le32_to_cpu (boot -> bigsect);
if (__le16_to_cpu (boot -> psect) != 0) {
- fs -> tot_sectors = __le16_to_cpu (boot -> psect);
+ fs -> tot_sectors = __le16_to_cpu (boot -> psect);
}
-
+
sect_per_track = heads * sectors;
tracks = (fs -> tot_sectors + sect_per_track - 1) / sect_per_track;
-
+
BootP = __le16_to_cpu (boot -> BootP);
Infp0 = __le16_to_cpu (boot -> Infp0);
InfpX = __le16_to_cpu (boot -> InfpX);
InfTm = __le16_to_cpu (boot -> InfTm);
-
+
if (boot -> dos4 == EXTENDED_BOOT &&
- strncmp( boot->banner,"2M", 2 ) == 0 &&
- BootP < SZ_STD_SECTOR &&
- Infp0 < SZ_STD_SECTOR &&
- InfpX < SZ_STD_SECTOR &&
- InfTm < SZ_STD_SECTOR &&
- BootP >= InfTm + 2 &&
- InfTm >= InfpX &&
- InfpX >= Infp0 &&
- Infp0 >= 76 ) {
+ strncmp( boot->banner,"2M", 2 ) == 0 &&
+ BootP < SZ_STD_SECTOR &&
+ Infp0 < SZ_STD_SECTOR &&
+ InfpX < SZ_STD_SECTOR &&
+ InfTm < SZ_STD_SECTOR &&
+ BootP >= InfTm + 2 &&
+ InfTm >= InfpX &&
+ InfpX >= Infp0 &&
+ Infp0 >= 76 ) {
- return (-1);
+ return (-1);
}
if (heads != NB_HEADS ||
- tracks != NB_TRACKS ||
- sectors != NB_SECTORS ||
- __le16_to_cpu (boot -> secsiz) != SZ_STD_SECTOR ||
- fs -> tot_sectors == 0 ||
- (fs -> tot_sectors % sectors) != 0) {
- return (-1);
+ tracks != NB_TRACKS ||
+ sectors != NB_SECTORS ||
+ __le16_to_cpu (boot -> secsiz) != SZ_STD_SECTOR ||
+ fs -> tot_sectors == 0 ||
+ (fs -> tot_sectors % sectors) != 0) {
+ return (-1);
}
-
+
return (0);
}