提交 a0f9dc31 编写于 作者: M mucor

fix: remove redundant headfile

1.remove redundant headfile in kernel, such as:
  compiler.h;debug.h;automount.h;inode.h;syslog.h;net.h;
2.split fs.h to file.h and driver.h
3.move vnode.h and path_cache.h to vfs/include
4.remove redundant interface and defines

close: #I3RTNR
Signed-off-by: Nmucor <mucorwang@gmail.com>
上级 81cdd5ae
...@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD: releng/11.4/sys/dev/usb/serial/usb_serial.c 331722 2018-03-2 ...@@ -68,7 +68,7 @@ __FBSDID("$FreeBSD: releng/11.4/sys/dev/usb/serial/usb_serial.c 331722 2018-03-2
#include <lwip/netifapi.h> #include <lwip/netifapi.h>
#endif #endif
#include "implementation/global_implementation.h" #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); extern int ucom_modem(struct ucom_softc *sc, int sigon, int sigoff);
......
...@@ -108,7 +108,6 @@ __FBSDID("$FreeBSD: releng/11.4/sys/dev/usb/storage/umass.c 331722 2018-03-29 02 ...@@ -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 "implementation/global_implementation.h"
#include "scsi_all.h" #include "scsi_all.h"
#include "scsi.h" #include "scsi.h"
#include "umass_fs.h"
#if USB_HAVE_DEVICE_TOPOLOGY #if USB_HAVE_DEVICE_TOPOLOGY
#include "implementation/usb_btree.h" #include "implementation/usb_btree.h"
#endif #endif
...@@ -233,6 +232,10 @@ DEBUG_MODULE(umass, umass_debug_func); ...@@ -233,6 +232,10 @@ DEBUG_MODULE(umass, umass_debug_func);
#define UR_BBB_RESET 0xff /* Bulk-Only reset */ #define UR_BBB_RESET 0xff /* Bulk-Only reset */
#define UR_BBB_GET_MAX_LUN 0xfe /* Get maximum lun */ #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 * SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO
* function codes. * function codes.
...@@ -3158,21 +3161,21 @@ umass_status(void) ...@@ -3158,21 +3161,21 @@ umass_status(void)
} }
static int static int
umass_open(FAR struct Vnode *filep) umass_open(struct Vnode *filep)
{ {
(void)filep; (void)filep;
return (0); return (0);
} }
static int static int
umass_close(FAR struct Vnode *filep) umass_close(struct Vnode *filep)
{ {
(void)filep; (void)filep;
return (0); return (0);
} }
static ssize_t 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) uint64_t start_sector, unsigned int nsectors)
{ {
int status; int status;
...@@ -3193,7 +3196,7 @@ umass_read(FAR struct Vnode *umass_inode, FAR unsigned char *buffer, ...@@ -3193,7 +3196,7 @@ umass_read(FAR struct Vnode *umass_inode, FAR unsigned char *buffer,
} }
static ssize_t 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) uint64_t start_sector, unsigned int nsectors)
{ {
int status; int status;
...@@ -3214,7 +3217,7 @@ umass_write(FAR struct Vnode *umass_inode, FAR const unsigned char *buffer, ...@@ -3214,7 +3217,7 @@ umass_write(FAR struct Vnode *umass_inode, FAR const unsigned char *buffer,
} }
static int 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; struct umass_softc *sc;
...@@ -3238,7 +3241,7 @@ umass_geometry(FAR struct Vnode *umass_inode, FAR struct geometry *ugeometry) ...@@ -3238,7 +3241,7 @@ umass_geometry(FAR struct Vnode *umass_inode, FAR struct geometry *ugeometry)
} }
static int 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)umass_inode;
(void)cmd; (void)cmd;
......
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
*/ */
#include "implementation/global_implementation.h" #include "implementation/global_implementation.h"
#include "fs/fs.h" #include "fs/driver.h"
#include "fs/file.h"
#include <unistd.h> #include <unistd.h>
#undef USB_DEBUG_VAR #undef USB_DEBUG_VAR
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
*/ */
#include "implementation/global_implementation.h" #include "implementation/global_implementation.h"
#include "fs/fs.h" #include "fs/driver.h"
#undef USB_DEBUG_VAR #undef USB_DEBUG_VAR
#define USB_DEBUG_VAR usb_debug #define USB_DEBUG_VAR usb_debug
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册