Module Name: src
Committed By: dholland
Date: Fri Jan 22 22:53:36 UTC 2016
Modified Files:
src/sys/fs/msdosfs: bpb.h direntry.h
Log Message:
u_int{8,16,32}_t -> uint{8,16,32}_t, also u_int -> unsigned and
u_char -> unsigned char.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/fs/msdosfs/bpb.h \
src/sys/fs/msdosfs/direntry.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/bpb.h
diff -u src/sys/fs/msdosfs/bpb.h:1.7 src/sys/fs/msdosfs/bpb.h:1.8
--- src/sys/fs/msdosfs/bpb.h:1.7 Sun Nov 4 17:57:59 2012
+++ src/sys/fs/msdosfs/bpb.h Fri Jan 22 22:53:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bpb.h,v 1.7 2012/11/04 17:57:59 jakllsch Exp $ */
+/* $NetBSD: bpb.h,v 1.8 2016/01/22 22:53:36 dholland Exp $ */
/*
* Written by Paul Popelka (pa...@uts.amdahl.com)
@@ -23,17 +23,17 @@
* BIOS Parameter Block (BPB) for DOS 3.3
*/
struct bpb33 {
- u_int16_t bpbBytesPerSec; /* bytes per sector */
- u_int8_t bpbSecPerClust; /* sectors per cluster */
- u_int16_t bpbResSectors; /* number of reserved sectors */
- u_int8_t bpbFATs; /* number of FATs */
- u_int16_t bpbRootDirEnts; /* number of root directory entries */
- u_int16_t bpbSectors; /* total number of sectors */
- u_int8_t bpbMedia; /* media descriptor */
- u_int16_t bpbFATsecs; /* number of sectors per FAT */
- u_int16_t bpbSecPerTrack; /* sectors per track */
- u_int16_t bpbHeads; /* number of heads */
- u_int16_t bpbHiddenSecs; /* number of hidden sectors */
+ uint16_t bpbBytesPerSec; /* bytes per sector */
+ uint8_t bpbSecPerClust; /* sectors per cluster */
+ uint16_t bpbResSectors; /* number of reserved sectors */
+ uint8_t bpbFATs; /* number of FATs */
+ uint16_t bpbRootDirEnts; /* number of root directory entries */
+ uint16_t bpbSectors; /* total number of sectors */
+ uint8_t bpbMedia; /* media descriptor */
+ uint16_t bpbFATsecs; /* number of sectors per FAT */
+ uint16_t bpbSecPerTrack; /* sectors per track */
+ uint16_t bpbHeads; /* number of heads */
+ uint16_t bpbHiddenSecs; /* number of hidden sectors */
};
/*
@@ -41,46 +41,46 @@ struct bpb33 {
* and bpbHugeSectors is not in the 3.3 bpb.
*/
struct bpb50 {
- u_int16_t bpbBytesPerSec; /* bytes per sector */
- u_int8_t bpbSecPerClust; /* sectors per cluster */
- u_int16_t bpbResSectors; /* number of reserved sectors */
- u_int8_t bpbFATs; /* number of FATs */
- u_int16_t bpbRootDirEnts; /* number of root directory entries */
- u_int16_t bpbSectors; /* total number of sectors */
- u_int8_t bpbMedia; /* media descriptor */
- u_int16_t bpbFATsecs; /* number of sectors per FAT */
- u_int16_t bpbSecPerTrack; /* sectors per track */
- u_int16_t bpbHeads; /* number of heads */
- u_int32_t bpbHiddenSecs; /* # of hidden sectors */
- u_int32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */
+ uint16_t bpbBytesPerSec; /* bytes per sector */
+ uint8_t bpbSecPerClust; /* sectors per cluster */
+ uint16_t bpbResSectors; /* number of reserved sectors */
+ uint8_t bpbFATs; /* number of FATs */
+ uint16_t bpbRootDirEnts; /* number of root directory entries */
+ uint16_t bpbSectors; /* total number of sectors */
+ uint8_t bpbMedia; /* media descriptor */
+ uint16_t bpbFATsecs; /* number of sectors per FAT */
+ uint16_t bpbSecPerTrack; /* sectors per track */
+ uint16_t bpbHeads; /* number of heads */
+ uint32_t bpbHiddenSecs; /* # of hidden sectors */
+ uint32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */
};
/*
* BPB for DOS 7.10 (FAT32). This one has a few extensions to bpb50.
*/
struct bpb710 {
- u_int16_t bpbBytesPerSec; /* bytes per sector */
- u_int8_t bpbSecPerClust; /* sectors per cluster */
- u_int16_t bpbResSectors; /* number of reserved sectors */
- u_int8_t bpbFATs; /* number of FATs */
- u_int16_t bpbRootDirEnts; /* number of root directory entries */
- u_int16_t bpbSectors; /* total number of sectors */
- u_int8_t bpbMedia; /* media descriptor */
- u_int16_t bpbFATsecs; /* number of sectors per FAT */
- u_int16_t bpbSecPerTrack; /* sectors per track */
- u_int16_t bpbHeads; /* number of heads */
- u_int32_t bpbHiddenSecs; /* # of hidden sectors */
- u_int32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */
- u_int32_t bpbBigFATsecs; /* like bpbFATsecs for FAT32 */
- u_int16_t bpbExtFlags; /* extended flags: */
+ uint16_t bpbBytesPerSec; /* bytes per sector */
+ uint8_t bpbSecPerClust; /* sectors per cluster */
+ uint16_t bpbResSectors; /* number of reserved sectors */
+ uint8_t bpbFATs; /* number of FATs */
+ uint16_t bpbRootDirEnts; /* number of root directory entries */
+ uint16_t bpbSectors; /* total number of sectors */
+ uint8_t bpbMedia; /* media descriptor */
+ uint16_t bpbFATsecs; /* number of sectors per FAT */
+ uint16_t bpbSecPerTrack; /* sectors per track */
+ uint16_t bpbHeads; /* number of heads */
+ uint32_t bpbHiddenSecs; /* # of hidden sectors */
+ uint32_t bpbHugeSectors; /* # of sectors if bpbSectors == 0 */
+ uint32_t bpbBigFATsecs; /* like bpbFATsecs for FAT32 */
+ uint16_t bpbExtFlags; /* extended flags: */
#define FATNUM 0xf /* mask for numbering active FAT */
#define FATMIRROR 0x80 /* FAT is mirrored (like it always was) */
- u_int16_t bpbFSVers; /* filesystem version */
+ uint16_t bpbFSVers; /* filesystem version */
#define FSVERS 0 /* currently only 0 is understood */
- u_int32_t bpbRootClust; /* start cluster for root directory */
- u_int16_t bpbFSInfo; /* filesystem info structure sector */
- u_int16_t bpbBackup; /* backup boot sector */
- u_int8_t bpbReserved[12]; /* Reserved for future expansion */
+ uint32_t bpbRootClust; /* start cluster for root directory */
+ uint16_t bpbFSInfo; /* filesystem info structure sector */
+ uint16_t bpbBackup; /* backup boot sector */
+ uint8_t bpbReserved[12]; /* Reserved for future expansion */
};
#ifdef atari
@@ -90,17 +90,17 @@ struct bpb710 {
*/
#if 0
struct bpb_a {
- u_int16_t bpbBytesPerSec; /* bytes per sector */
- u_int8_t bpbSecPerClust; /* sectors per cluster */
- u_int16_t bpbResSectors; /* number of reserved sectors */
- u_int8_t bpbFATs; /* number of FATs */
- u_int16_t bpbRootDirEnts; /* number of root directory entries */
- u_int16_t bpbSectors; /* total number of sectors */
- u_int8_t bpbUseless1; /* meaningless on GEMDOS FS */
- u_int16_t bpbFATsecs; /* number of sectors per FAT */
- u_int16_t bpbUseless2; /* meaningless for harddisk fs */
- u_int16_t bpbUseless3; /* meaningless for harddisk fs */
- u_int16_t bpbHiddenSecs; /* the TOS-BIOS ignores this */
+ uint16_t bpbBytesPerSec; /* bytes per sector */
+ uint8_t bpbSecPerClust; /* sectors per cluster */
+ uint16_t bpbResSectors; /* number of reserved sectors */
+ uint8_t bpbFATs; /* number of FATs */
+ uint16_t bpbRootDirEnts; /* number of root directory entries */
+ uint16_t bpbSectors; /* total number of sectors */
+ uint8_t bpbUseless1; /* meaningless on GEMDOS FS */
+ uint16_t bpbFATsecs; /* number of sectors per FAT */
+ uint16_t bpbUseless2; /* meaningless for harddisk fs */
+ uint16_t bpbUseless3; /* meaningless for harddisk fs */
+ uint16_t bpbHiddenSecs; /* the TOS-BIOS ignores this */
};
#endif
#endif /* atari */
@@ -159,39 +159,39 @@ struct byte_bpb50 {
* BPB for DOS 7.10 (FAT32). This one has a few extensions to bpb50.
*/
struct byte_bpb710 {
- u_int8_t bpbBytesPerSec[2]; /* bytes per sector */
- u_int8_t bpbSecPerClust; /* sectors per cluster */
- u_int8_t bpbResSectors[2]; /* number of reserved sectors */
- u_int8_t bpbFATs; /* number of FATs */
- u_int8_t bpbRootDirEnts[2]; /* number of root directory entries */
- u_int8_t bpbSectors[2]; /* total number of sectors */
- u_int8_t bpbMedia; /* media descriptor */
- u_int8_t bpbFATsecs[2]; /* number of sectors per FAT */
- u_int8_t bpbSecPerTrack[2]; /* sectors per track */
- u_int8_t bpbHeads[2]; /* number of heads */
- u_int8_t bpbHiddenSecs[4]; /* # of hidden sectors */
- u_int8_t bpbHugeSectors[4]; /* # of sectors if bpbSectors == 0 */
- u_int8_t bpbBigFATsecs[4]; /* like bpbFATsecs for FAT32 */
- u_int8_t bpbExtFlags[2]; /* extended flags: */
- u_int8_t bpbFSVers[2]; /* filesystem version */
- u_int8_t bpbRootClust[4]; /* start cluster for root directory */
- u_int8_t bpbFSInfo[2]; /* filesystem info structure sector */
- u_int8_t bpbBackup[2]; /* backup boot sector */
- u_int8_t bpbReserved[12]; /* Reserved for future expansion */
+ uint8_t bpbBytesPerSec[2]; /* bytes per sector */
+ uint8_t bpbSecPerClust; /* sectors per cluster */
+ uint8_t bpbResSectors[2]; /* number of reserved sectors */
+ uint8_t bpbFATs; /* number of FATs */
+ uint8_t bpbRootDirEnts[2]; /* number of root directory entries */
+ uint8_t bpbSectors[2]; /* total number of sectors */
+ uint8_t bpbMedia; /* media descriptor */
+ uint8_t bpbFATsecs[2]; /* number of sectors per FAT */
+ uint8_t bpbSecPerTrack[2]; /* sectors per track */
+ uint8_t bpbHeads[2]; /* number of heads */
+ uint8_t bpbHiddenSecs[4]; /* # of hidden sectors */
+ uint8_t bpbHugeSectors[4]; /* # of sectors if bpbSectors == 0 */
+ uint8_t bpbBigFATsecs[4]; /* like bpbFATsecs for FAT32 */
+ uint8_t bpbExtFlags[2]; /* extended flags: */
+ uint8_t bpbFSVers[2]; /* filesystem version */
+ uint8_t bpbRootClust[4]; /* start cluster for root directory */
+ uint8_t bpbFSInfo[2]; /* filesystem info structure sector */
+ uint8_t bpbBackup[2]; /* backup boot sector */
+ uint8_t bpbReserved[12]; /* Reserved for future expansion */
};
/*
* FAT32 FSInfo block.
*/
struct fsinfo {
- u_int8_t fsisig1[4];
- u_int8_t fsifill1[480];
- u_int8_t fsisig2[4];
- u_int8_t fsinfree[4];
- u_int8_t fsinxtfree[4];
- u_int8_t fsifill2[12];
- u_int8_t fsisig3[4];
- u_int8_t fsifill3[508];
- u_int8_t fsisig4[4];
+ uint8_t fsisig1[4];
+ uint8_t fsifill1[480];
+ uint8_t fsisig2[4];
+ uint8_t fsinfree[4];
+ uint8_t fsinxtfree[4];
+ uint8_t fsifill2[12];
+ uint8_t fsisig3[4];
+ uint8_t fsifill3[508];
+ uint8_t fsisig4[4];
};
#endif /* _MSDOSFS_BPB_H_ */
Index: src/sys/fs/msdosfs/direntry.h
diff -u src/sys/fs/msdosfs/direntry.h:1.7 src/sys/fs/msdosfs/direntry.h:1.8
--- src/sys/fs/msdosfs/direntry.h:1.7 Sun Oct 20 00:01:55 2013
+++ src/sys/fs/msdosfs/direntry.h Fri Jan 22 22:53:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: direntry.h,v 1.7 2013/10/20 00:01:55 christos Exp $ */
+/* $NetBSD: direntry.h,v 1.8 2016/01/22 22:53:36 dholland Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -53,12 +53,12 @@
* Structure of a dos directory entry.
*/
struct direntry {
- u_int8_t deName[8]; /* filename, blank filled */
+ uint8_t deName[8]; /* filename, blank filled */
#define SLOT_EMPTY 0x00 /* slot has never been used */
#define SLOT_E5 0x05 /* the real value is 0xe5 */
#define SLOT_DELETED 0xe5 /* file in this slot deleted */
- u_int8_t deExtension[3]; /* extension, blank filled */
- u_int8_t deAttributes; /* file attributes */
+ uint8_t deExtension[3]; /* extension, blank filled */
+ uint8_t deAttributes; /* file attributes */
#define ATTR_NORMAL 0x00 /* normal file */
#define ATTR_READONLY 0x01 /* file is readonly */
#define ATTR_HIDDEN 0x02 /* file is hidden */
@@ -66,16 +66,16 @@ struct direntry {
#define ATTR_VOLUME 0x08 /* entry is a volume label */
#define ATTR_DIRECTORY 0x10 /* entry is a directory name */
#define ATTR_ARCHIVE 0x20 /* file is new or modified */
- u_int8_t deReserved; /* reserved */
- u_int8_t deCHundredth; /* hundredth of seconds in CTime */
- u_int8_t deCTime[2]; /* create time */
- u_int8_t deCDate[2]; /* create date */
- u_int8_t deADate[2]; /* access date */
- u_int8_t deHighClust[2]; /* high bytes of cluster number */
- u_int8_t deMTime[2]; /* last update time */
- u_int8_t deMDate[2]; /* last update date */
- u_int8_t deStartCluster[2]; /* starting cluster of file */
- u_int8_t deFileSize[4]; /* size of file in bytes */
+ uint8_t deReserved; /* reserved */
+ uint8_t deCHundredth; /* hundredth of seconds in CTime */
+ uint8_t deCTime[2]; /* create time */
+ uint8_t deCDate[2]; /* create date */
+ uint8_t deADate[2]; /* access date */
+ uint8_t deHighClust[2]; /* high bytes of cluster number */
+ uint8_t deMTime[2]; /* last update time */
+ uint8_t deMDate[2]; /* last update date */
+ uint8_t deStartCluster[2]; /* starting cluster of file */
+ uint8_t deFileSize[4]; /* size of file in bytes */
};
static __inline uint8_t
@@ -88,17 +88,17 @@ msdos_dirchar(const struct direntry *de,
* Structure of a Win95 long name directory entry
*/
struct winentry {
- u_int8_t weCnt;
+ uint8_t weCnt;
#define WIN_LAST 0x40
#define WIN_CNT 0x3f
- u_int8_t wePart1[10];
- u_int8_t weAttributes;
+ uint8_t wePart1[10];
+ uint8_t weAttributes;
#define ATTR_WIN95 0x0f
- u_int8_t weReserved1;
- u_int8_t weChksum;
- u_int8_t wePart2[12];
- u_int16_t weReserved2;
- u_int8_t wePart3[4];
+ uint8_t weReserved1;
+ uint8_t weChksum;
+ uint8_t wePart2[12];
+ uint16_t weReserved2;
+ uint8_t wePart3[4];
};
#define WIN_CHARS 13 /* Number of chars per winentry */
@@ -128,19 +128,19 @@ struct winentry {
#if defined(_KERNEL) || defined(MAKEFS)
struct dirent;
-void unix2dostime(const struct timespec *tsp, int gmtoff, u_int16_t *ddp,
- u_int16_t *dtp, u_int8_t *dhp);
-void dos2unixtime(u_int dd, u_int dt, u_int dh, int gmtoff,
+void unix2dostime(const struct timespec *tsp, int gmtoff, uint16_t *ddp,
+ uint16_t *dtp, uint8_t *dhp);
+void dos2unixtime(unsigned dd, unsigned dt, unsigned dh, int gmtoff,
struct timespec *tsp);
-int dos2unixfn(u_char dn[11], u_char *un, int lower);
-int unix2dosfn(const u_char *un, u_char dn[12], int unlen,
- u_int gen);
-int unix2winfn(const u_char *un, int unlen, struct winentry *wep,
+int dos2unixfn(unsigned char dn[11], unsigned char *un, int lower);
+int unix2dosfn(const unsigned char *un, unsigned char dn[12], int unlen,
+ unsigned gen);
+int unix2winfn(const unsigned char *un, int unlen, struct winentry *wep,
int cnt, int chksum);
-int winChkName(const u_char *un, int unlen, struct winentry *wep,
+int winChkName(const unsigned char *un, int unlen, struct winentry *wep,
int chksum);
int win2unixfn(struct winentry *wep, struct dirent *dp, int chksum);
-u_int8_t winChksum(u_int8_t *name);
-int winSlotCnt(const u_char *un, int unlen);
+uint8_t winChksum(uint8_t *name);
+int winSlotCnt(const unsigned char *un, int unlen);
#endif /* _KERNEL || MAKEFS */
#endif /* _MSDOSFS_DIRENTRY_H_ */
