Added 640KB and 1232KB formats, which were standard MS-DOS formats of

2DD and 2HD disks in Japan.

Submitted by:	Shigeharu TAKENO <shige@iee.niit.ac.jp>
Pointed out by:	chi@bd.mbn.or.jp (Chiharu Shibata)

2 files changed, 4 insertions, 2 deletions

diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 13fdccd..52a157b 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -98,8 +98,8 @@ Sectors per cluster.  Acceptable values are powers of 2 in the range
 Number of root directory entries (FAT12 and FAT16 only).
 .It Fl f Ar format
 Specify a standard (floppy disk) format.  The eight standard formats
-are (capacities in kilobytes): 160, 180, 320, 360, 720, 1200, 1440,
-2880.
+are (capacities in kilobytes): 160, 180, 320, 360, 640, 720, 1200,
+1232, 1440, 2880.
 .It Fl h Ar heads
 Number of drive heads.
 .It Fl i Ar info
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index 0d6109b..926f0ee 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -167,8 +167,10 @@ static struct {
     {"180",  {512, 1, 1, 2,  64,  360, 0xfc, 2,  9, 1}},
     {"320",  {512, 2, 1, 2, 112,  640, 0xff, 1,  8, 2}},
     {"360",  {512, 2, 1, 2, 112,  720, 0xfd, 2,  9, 2}},
+    {"640",  {512, 2, 1, 2, 112, 1280, 0xfb, 2,  8, 2}},    
     {"720",  {512, 2, 1, 2, 112, 1440, 0xf9, 3,  9, 2}},
     {"1200", {512, 1, 1, 2, 224, 2400, 0xf9, 7, 15, 2}},
+    {"1232", {1024,1, 1, 2, 192, 1232, 0xfe, 2,  8, 2}},    
     {"1440", {512, 1, 1, 2, 224, 2880, 0xf0, 9, 18, 2}},
     {"2880", {512, 2, 1, 2, 240, 5760, 0xf0, 9, 36, 2}}
 };