Browse Source

Revert "Bring in the virtqueue definitions from the virtio spec 1.0. Make sure"

This reverts commit db0ccedae86f62178dc57f41b289fd0f38a18bb1.

We need to bring the external code in a bit more staged.

First, bring the files in with the source (kernel) and git ref
of where they're from. Then start changing them.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

Conflicts:
	sys/src/9/386/pci.c
	sys/src/9/amd64/virtio_ring.h
	sys/src/9/port/devpci.c
Ronald G. Minnich 7 years ago
parent
commit
aa92fce43e
2 changed files with 1 additions and 10 deletions
  1. 1 5
      sys/src/9/386/pci.c
  2. 0 5
      sys/src/9/port/devpci.c

+ 1 - 5
sys/src/9/386/pci.c

@@ -179,11 +179,6 @@ pcilscan(int bno, char *path, Pcidev** list)
 			if(hdt & 0x80)
 				maxfno = Maxfn;
 
-			/*
-			 * Some virtio-pci devices (e. g. 9p) have ccrb = 0x00, 
-			 * their BARs and sizes also should be picked up here.
-			 */
-
 			/*
 			 * If appropriate, read the base address registers
 			 * and work out the sizes.
@@ -198,6 +193,7 @@ pcilscan(int bno, char *path, Pcidev** list)
 				}
 				break;
 
+			case 0x00:
 			case 0x05:		/* memory controller */
 			case 0x06:		/* bridge device */
 				break;

+ 0 - 5
sys/src/9/port/devpci.c

@@ -15,11 +15,6 @@
 #include	"io.h"
 #include	"../port/error.h"
 
-// Include the definitions from VIRTIO spec v1.0
-// http://docs.oasis-open.org/virtio/virtio/v1.0/csprd02/listings/virtio_ring.h
-
-#include	"virtio_ring.h"
-
 enum {
 	Qtopdir = 0,