Hi!
- (Eric) cleanup for types. This _not_ changes generated code.
--- Begin Message ---
diff -ruNp old/hdr/dcb.h new/hdr/dcb.h
--- old/hdr/dcb.h 2002-12-08 16:17:16.000000000 +0000
+++ new/hdr/dcb.h 2004-07-20 15:08:40.000000000 +0000
@@ -80,8 +80,8 @@ struct dpb {
ULONG dpb_xdata;
ULONG dpb_xsize; /* # of clusters+1 on media */
ULONG dpb_xfatsize; /* # of sectors / FAT */
- ULONG dpb_xrootclst; /* starting cluster of root dir */
- ULONG dpb_xcluster; /* cluster # of first free */
+ CLUSTER dpb_xrootclst; /* starting cluster of root dir */
+ CLUSTER dpb_xcluster; /* cluster # of first free */
/* -1 if not known */
#endif
};
@@ -89,4 +89,3 @@ struct dpb {
#define UNKNCLUSTER 0x0000 /* see RBIL INT 21/AH=52 entry */
#define XUNKNCLSTFREE 0xffffffffl /* unknown for DOS */
#define UNKNCLSTFREE 0xffff /* unknown for DOS */
-
diff -ruNp old/hdr/device.h new/hdr/device.h
--- old/hdr/device.h 2004-05-29 02:51:28.000000000 +0000
+++ new/hdr/device.h 2004-07-20 15:09:46.000000000 +0000
@@ -174,7 +174,7 @@ typedef struct {
/* bits 6-4: reserved (0) */
/* bits 3-0: active FAT number */
UWORD bpb_xfsversion; /* filesystem version */
- ULONG bpb_xrootclst; /* starting cluster of root dir */
+ CLUSTER bpb_xrootclst; /* starting cluster of root dir */
UWORD bpb_xfsinfosec; /* FS info sector number, */
/* 0xFFFF if unknown */
UWORD bpb_xbackupsec; /* backup boot sector number */
diff -ruNp old/hdr/dirmatch.h new/hdr/dirmatch.h
--- old/hdr/dirmatch.h 2002-12-08 16:17:16.000000000 +0000
+++ new/hdr/dirmatch.h 2004-07-20 15:06:50.000000000 +0000
@@ -37,33 +37,26 @@ static BYTE *dirmatch_hRcsId =
typedef struct {
UBYTE dm_drive;
- BYTE dm_name_pat[FNAME_SIZE + FEXT_SIZE];
- BYTE dm_attr_srch;
+ char dm_name_pat[FNAME_SIZE + FEXT_SIZE];
+ BYTE dm_attr_srch; /* should be UBYTE --avb */
UWORD dm_entry;
-#ifdef WITHFAT32
- ULONG dm_dircluster;
-#else
- UWORD dm_dircluster;
+ CLUSTER dm_dircluster;
+#ifndef WITHFAT32
UWORD reserved;
#endif
struct {
- BITS /* directory has been modified */
- f_dmod:1;
- BITS /* directory is the root */
- f_droot:1;
- BITS /* fnode is new and needs fill */
- f_dnew:1;
- BITS /* fnode is assigned to dir */
- f_ddir:1;
- BITS /* filler to avoid a bad bug (feature?) in */
- f_filler:12; /* TC 2.01 */
+ BITS f_dmod:1; /* directory has been modified */
+ BITS f_droot:1; /* directory is the root */
+ BITS f_dnew:1; /* fnode is new and needs fill */
+ BITS f_ddir:1; /* fnode is assigned to dir */
+ BITS f_filler:12; /* filler to avoid a bad bug */
+ /* (feature?) in TC 2.01 */
} dm_flags; /* file flags */
- BYTE dm_attr_fnd; /* found file attribute */
+ UBYTE dm_attr_fnd; /* found file attribute */
time dm_time; /* file time */
date dm_date; /* file date */
- LONG dm_size; /* file size */
- BYTE dm_name[FNAME_SIZE + FEXT_SIZE + 2]; /* file name */
+ ULONG dm_size; /* file size */
+ char dm_name[FNAME_SIZE + FEXT_SIZE + 2]; /* file name */
} dmatch;
-
--- End Message ---