X-Git-Url: https://gitweb.dragonflybsd.org/~corecode/dragonfly.git/blobdiff_plain/6393ca9ff8f5853139b34a97044122866bf38672..644dc3ab93c56a0224e97d18b17a86913d0f61f2:/sys/vfs/msdosfs/msdosfsmount.h

diff --git a/sys/vfs/msdosfs/msdosfsmount.h b/sys/vfs/msdosfs/msdosfsmount.h
index a751ca644e..d67fd295fd 100644
--- a/sys/vfs/msdosfs/msdosfsmount.h
+++ b/sys/vfs/msdosfs/msdosfsmount.h
@@ -58,9 +58,8 @@
 MALLOC_DECLARE(M_MSDOSFSMNT);
 #endif
 #endif
-
+#include <sys/iconv.h>
 #if defined(_KERNEL) || defined(_KERNEL_STRUCTURES)
-
 /*
  * Layout of the mount control block for a msdos file system.
  */
@@ -97,11 +96,10 @@ struct msdosfsmount {
 	u_int *pm_inusemap;	/* ptr to bitmap of in-use clusters */
 	u_int pm_flags;		/* see below */
 	struct netexport pm_export;	/* export information */
-	u_int16_t pm_u2w[128];  /* Local->Unicode table */
-	u_int8_t  pm_ul[128];   /* Local upper->lower table */
-	u_int8_t  pm_lu[128];   /* Local lower->upper table */
-	u_int8_t  pm_d2u[128];  /* DOS->local table */
-	u_int8_t  pm_u2d[128];  /* Local->DOS table */
+	void *pm_u2w;  /* Local->Unicode handle */
+	void *pm_w2u;  /* Unicode->Local handle */
+	void *pm_d2u;  /* DOS->local handle */
+	void *pm_u2d;  /* Local->DOS handle */
 };
 /* Byte offset in FAT on filesystem pmp, cluster cn */
 #define	FATOFS(pmp, cn)	((cn) * (pmp)->pm_fatmult / (pmp)->pm_fatdiv)
@@ -248,11 +246,8 @@ struct msdosfs_args {
 	mode_t	mask;		/* mask to be applied for msdosfs perms */
 	int	flags;		/* see below */
 	int magic;		/* version number */
-	u_int16_t u2w[128];     /* Local->Unicode table */
-	u_int8_t  ul[128];      /* Local upper->lower table */
-	u_int8_t  lu[128];      /* Local lower->upper table */
-	u_int8_t  d2u[128];     /* DOS->local table */
-	u_int8_t  u2d[128];     /* Local->DOS table */
+        char cs_local[ICONV_CSNMAXLEN];
+        char cs_dos[ICONV_CSNMAXLEN];
 };
 
 /*
@@ -261,13 +256,12 @@ struct msdosfs_args {
 #define	MSDOSFSMNT_SHORTNAME	1	/* Force old DOS short names only */
 #define	MSDOSFSMNT_LONGNAME	2	/* Force Win'95 long names */
 #define	MSDOSFSMNT_NOWIN95	4	/* Completely ignore Win95 entries */
-#define MSDOSFSMNT_U2WTABLE     0x10    /* Local->Unicode and local<->DOS   */
+#define MSDOSFSMNT_KICONV     0x10    /* Local->Unicode and local<->DOS   */
 					/* tables loaded                    */
-#define MSDOSFSMNT_ULTABLE      0x20    /* Local upper<->lower table loaded */
 /* All flags above: */
 #define	MSDOSFSMNT_MNTOPT \
 	(MSDOSFSMNT_SHORTNAME|MSDOSFSMNT_LONGNAME|MSDOSFSMNT_NOWIN95 \
-	 /*|MSDOSFSMNT_GEMDOSFS*/|MSDOSFSMNT_U2WTABLE|MSDOSFSMNT_ULTABLE)
+	 /*|MSDOSFSMNT_GEMDOSFS*/|MSDOSFSMNT_KICONV)
 #define	MSDOSFSMNT_RONLY	0x80000000	/* mounted read-only	*/
 #define	MSDOSFSMNT_WAITONFAT	0x40000000	/* mounted synchronous	*/
 #define	MSDOSFS_FATMIRROR	0x20000000	/* FAT is mirrored */