Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[vxge] Add stub vxge.c file so bin/vxge.usb can be built
The vxge driver code is split over several files, including vxge_main.c.
This causes the build system and ROM-o-matic to see the driver as
"vxge_main".

This patch adds a stub vxge.c which takes up no space but gives the
driver its proper name, "vxge".

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
  • Loading branch information
stefanha authored and Marty Connor committed Mar 12, 2010
1 parent 6a6f26f commit 6877c84
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
18 changes: 18 additions & 0 deletions src/drivers/net/vxge/vxge.c
@@ -0,0 +1,18 @@
/** @file Stub file for vxge driver
*
* This file drags in the rest of the driver for Neterion Inc's X3100 Series
* 10GbE PCIe I/O Virtualized Server Adapter, allowing the driver to be built
* as "vxge" even though the code is in vxge_* named files.
*/

FILE_LICENCE(GPL2_OR_LATER);

#include <gpxe/pci.h>

REQUIRE_OBJECT(vxge_main);

/** vxge PCI IDs for util/parserom.pl which are put into bin/NIC */
static struct pci_device_id vxge_nics[] __unused = {
/* If you change this, also adjust vxge_main_nics[] in vxge_main.c */
PCI_ROM(0x17d5, 0x5833, "vxge-x3100", "Neterion X3100 Series", 0),
};
9 changes: 5 additions & 4 deletions src/drivers/net/vxge/vxge_main.c
Expand Up @@ -712,13 +712,14 @@ static struct net_device_operations vxge_operations = {
.irq = vxge_irq,
};

static struct pci_device_id vxge_nics[] = {
PCI_ROM(0x17d5, 0x5833, "vxge-x3100", "Neterion X3100 Series", 0),
static struct pci_device_id vxge_main_nics[] = {
/* If you change this, also adjust vxge_nics[] in vxge.c */
PCI_ID(0x17d5, 0x5833, "vxge-x3100", "Neterion X3100 Series", 0),
};

struct pci_driver vxge_driver __pci_driver = {
.ids = vxge_nics,
.id_count = (sizeof(vxge_nics) / sizeof(vxge_nics[0])),
.ids = vxge_main_nics,
.id_count = (sizeof(vxge_main_nics) / sizeof(vxge_main_nics[0])),
.probe = vxge_probe,
.remove = vxge_remove,
};

0 comments on commit 6877c84

Please sign in to comment.