Browse Source

Normalize virtio_9p.h for Harvey.

Signed-off-by: golubovsky <golubovsky@gmail.com>
golubovsky 7 years ago
parent
commit
dc996dfd76
2 changed files with 32 additions and 37 deletions
  1. 2 8
      sys/include/virtio_9p.h
  2. 30 29
      sys/src/9/port/dev9p.c

+ 2 - 8
sys/include/virtio_9p.c → sys/include/virtio_9p.h

@@ -1,5 +1,3 @@
-#ifndef _LINUX_VIRTIO_9P_H
-#define _LINUX_VIRTIO_9P_H
 /* This header is BSD licensed so anyone can use the definitions to implement
  * compatible drivers/servers.
  *
@@ -25,9 +23,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE. */
-#include <linux/types.h>
-#include <linux/virtio_ids.h>
-#include <linux/virtio_config.h>
 
 /* The feature bitmap for virtio 9P */
 
@@ -36,9 +31,8 @@
 
 struct virtio_9p_config {
 	/* length of the tag name */
-	__u16 tag_len;
+	uint16_t tag_len;
 	/* non-NULL terminated tag name */
-	__u8 tag[0];
+	uint8_t tag[0];
 } __attribute__((packed));
 
-#endif /* _LINUX_VIRTIO_9P_H */

+ 30 - 29
sys/src/9/port/dev9p.c

@@ -11,38 +11,39 @@
 // dev9p.c ('#9'): a virtio9p protocol translation driver to use QEMU's built-in 9p.
 
 
-#include        "u.h"
-#include        "../port/lib.h"
-#include        "mem.h"
-#include        "dat.h"
-#include        "fns.h"
-#include        "io.h"
-#include        "../port/error.h"
+#include	"u.h"
+#include	"../port/lib.h"
+#include	"mem.h"
+#include	"dat.h"
+#include	"fns.h"
+#include	"io.h"
+#include	"../port/error.h"
 
-#include        "virtio_ring.h"
+#include	"virtio_ring.h"
 
-#include        "virtio_config.h"
-#include        "virtio_pci.h"
+#include	"virtio_config.h"
+#include	"virtio_9p.h"
+#include	"virtio_pci.h"
 
-#include        "virtio_lib.h"
+#include	"virtio_lib.h"
 
 Dev v9pdevtab = {
-        .dc = '9',
-        .name = "9p",
-
-        .reset = devreset,
-        .init = v9pinit,
-        .shutdown = devshutdown,
-        .attach = v9pattach,
-        .walk = v9pwalk,
-        .stat = v9pstat,
-        .open = v9popen,
-        .create = devcreate,
-        .close = v9pclose,
-        .read = v9pread,
-        .bread = devbread,
-        .write = v9pwrite,
-        .bwrite = devbwrite,
-        .remove = devremove,
-        .wstat = devwstat,
+	.dc = '9',
+	.name = "9p",
+
+	.reset = devreset,
+//	.init = v9pinit,
+	.shutdown = devshutdown,
+//	.attach = v9pattach,
+//	.walk = v9pwalk,
+//	.stat = v9pstat,
+//	.open = v9popen,
+	.create = devcreate,
+//	.close = v9pclose,
+//	.read = v9pread,
+	.bread = devbread,
+//	.write = v9pwrite,
+	.bwrite = devbwrite,
+	.remove = devremove,
+	.wstat = devwstat,
 };