Commit 617a004f authored by Wojciech Malikowski's avatar Wojciech Malikowski Committed by Jim Harris
Browse files

lib/vmd: Merge vmd.c and vmd_pci.c into one file 



There is no need to keep this functionality in separate
files.

Change-Id: Ie998324cbcfcdc384f912fe36124b082774c0dc8
Signed-off-by: default avatarWojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/456475


Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5f4e42b8

lib/vmd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



C_SRCS = vmd.c vmdpci.c

C_SRCS = vmd.c

LIBNAME = vmd



include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk

lib/vmd/vmd.c

+778 −13

File changed.

Preview size limit exceeded, changes collapsed.

lib/vmd/vmdpci.h→lib/vmd/vmd.h

+3 −11
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef VMD_PCI_H

#define VMD_PCI_H

#ifndef VMD_H

#define VMD_H



#include "spdk/stdinc.h"

#include "spdk/vmd.h"
@@ -160,7 +160,6 @@ typedef struct vmd_adapter { 


} vmd_adapter;





/* TODO: Temporary stubs for Hot Plug interface */

static inline vmd_pci_bus *

vmd_is_dev_in_hotplug_path(vmd_pci_device *dev)
@@ -194,11 +193,4 @@ vmd_hp_get_next_bus_number(struct vmd_hot_plug *hp) 
	return 0;

}



/*

 * Pci interface

 */

bool    vmd_is_supported_device(vmd_pci_device *dev);

uint8_t vmd_scan_pcibus(vmd_pci_bus *bus);

void    vmd_dev_init(vmd_pci_device *dev);



#endif /* VMD_PCI_H */
 
#endif /* VMD_H */

lib/vmd/vmdpci.c

deleted100644 → 0
+0 −801

File deleted.

Preview size limit exceeded, changes collapsed.