!18 文件系统冗余代码和依赖删除

Merge pull request !18 from 野生毛霉君/master

sys/dev/usb/serial/usb_serial.c

@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD: releng/11.4/sys/dev/usb/serial/usb_serial.c 331722 2018-03-2
 #include <lwip/netifapi.h>
 #endif
 #include "implementation/global_implementation.h"
-#include "fs/fs.h"
+#include "fs/driver.h"
 
 extern int ucom_modem(struct ucom_softc *sc, int sigon, int sigoff);
 

sys/dev/usb/storage/umass.c

@@ -108,7 +108,6 @@ __FBSDID("$FreeBSD: releng/11.4/sys/dev/usb/storage/umass.c 331722 2018-03-29 02
 #include "implementation/global_implementation.h"
 #include "scsi_all.h"
 #include "scsi.h"
-#include "umass_fs.h"
 #if USB_HAVE_DEVICE_TOPOLOGY
 #include "implementation/usb_btree.h"
 #endif
@@ -233,6 +232,10 @@ DEBUG_MODULE(umass, umass_debug_func);
 #define	UR_BBB_RESET		0xff	/* Bulk-Only reset */
 #define	UR_BBB_GET_MAX_LUN	0xfe	/* Get maximum lun */
 
+#define UMASS_ATTACH_PRENAME		"/dev/sd"
+#define MASS_NAME		10
+#define MAX_DEVICE		5
+
 /*
  * SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO
  * function codes.
@@ -3158,21 +3161,21 @@ umass_status(void)
 }
 
 static int
-umass_open(FAR struct Vnode *filep)
+umass_open(struct Vnode *filep)
 {
 	(void)filep;
 	return (0);
 }
 
 static int
-umass_close(FAR struct Vnode *filep)
+umass_close(struct Vnode *filep)
 {
 	(void)filep;
 	return (0);
 }
 
 static ssize_t
-umass_read(FAR struct Vnode *umass_inode, FAR unsigned char *buffer,
+umass_read(struct Vnode *umass_inode, unsigned char *buffer,
 		    uint64_t start_sector, unsigned int nsectors)
 {
 	int status;
@@ -3193,7 +3196,7 @@ umass_read(FAR struct Vnode *umass_inode, FAR unsigned char *buffer,
 }
 
 static ssize_t
-umass_write(FAR struct Vnode *umass_inode, FAR const unsigned char *buffer,
+umass_write(struct Vnode *umass_inode, const unsigned char *buffer,
 		    uint64_t start_sector, unsigned int nsectors)
 {
 	int status;
@@ -3214,7 +3217,7 @@ umass_write(FAR struct Vnode *umass_inode, FAR const unsigned char *buffer,
 }
 
 static int
-umass_geometry(FAR struct Vnode *umass_inode, FAR struct geometry *ugeometry)
+umass_geometry(struct Vnode *umass_inode, struct geometry *ugeometry)
 {
 	struct umass_softc *sc;
 
@@ -3238,7 +3241,7 @@ umass_geometry(FAR struct Vnode *umass_inode, FAR struct geometry *ugeometry)
 }
 
 static int
-umass_ioctl(FAR struct Vnode *umass_inode, int cmd, unsigned long arg)
+umass_ioctl(struct Vnode *umass_inode, int cmd, unsigned long arg)
 {
 	(void)umass_inode;
 	(void)cmd;

sys/dev/usb/usb_dev.c

@@ -28,7 +28,8 @@
  */
 
 #include "implementation/global_implementation.h"
-#include "fs/fs.h"
+#include "fs/driver.h"
+#include "fs/file.h"
 #include <unistd.h>
 
 #undef USB_DEBUG_VAR

sys/dev/usb/usb_device.c

@@ -25,7 +25,7 @@
  */
 
 #include "implementation/global_implementation.h"
-#include "fs/fs.h"
+#include "fs/driver.h"
 
 #undef USB_DEBUG_VAR
 #define USB_DEBUG_VAR   usb_debug