Attachment #18883 for bug #27208

View | Details | Raw Unified | Return to bug 27208
Collapse All | Expand All




#
# Target
#
TARGET = $(MODULE_NAME).ko

#
# Networking library

CFLAGS = -c -Wall -DLINUX -DMODULE -DEXPORT_SYMTAB -D__KERNEL__ -O \
	-Wstrict-prototypes -DCONFIG_PM  -fno-strict-aliasing \
        -mpreferred-stack-boundary=2 -march=i686 $(ALIGN) \
	-DKBUILD_BASENAME=nvnet -DKBUILD_MODNAME=nvnet -fno-common \
        -DMODULE -I$(SYSINCLUDE) -I$(SYSINCLUDE)/asm/mach-default $(ARCHDEFS)

#
# Kernel version


all: $(TARGET) 

nvnet.o: $(SRC)
	$(CC) $(CFLAGS) $(SRC)

nvnet.mod.c: nvnet.o
	$(KERNSRC)/scripts/modpost nvnet.o

nvnet.mod.o: nvnet.mod.c
	$(CC) $(CFLAGS) nvnet.mod.c

$(TARGET): nvnet.o nvnet.mod.o $(NVNETLIB)
	ld -r -o $(TEMP) nvnet.o nvnet.mod.o $(NVNETLIB)
	cp $(TEMP) $(TARGET)
	rm $(TEMP)


# Delete generated files
#
clean:
	rm -f $(TARGET) nvnet.o *.mod.c *.mod.o

Lines 26-31 Link Here

(-)nvnet/nvnet.c (-3 / +9 lines)
26	char *common_hdO_version_string = HDO_VERSION_STRING;	26	char *common_hdO_version_string = HDO_VERSION_STRING;
27	char *common_hdP_version_string = HDP_VERSION_STRING;	27	char *common_hdP_version_string = HDP_VERSION_STRING;
28		28
		29	// fix for common symbol exported by nvnetlib.o
		30	char* aPhyAddrAndId[256];
		31
29	/*	32	/*
30	* Driver information	33	* Driver information
31	*/	34	*/
Lines 753-759 Link Here
753	}	756	}
754		757
755		758
756	static void nvnet_interrupt(int irq, void dev_instance, struct pt_regs regs)	759	static irqreturn_t nvnet_interrupt(int irq, void dev_instance, struct pt_regs regs)
757	{	760	{
758	struct net_device *dev;	761	struct net_device *dev;
759	struct nvnet_private *priv;	762	struct nvnet_private *priv;
Lines 765-771 Link Here
765	irq, dev_instance, regs);	768	irq, dev_instance, regs);
766		769
767	if(!dev)	770	if(!dev)
768	return;	771	return IRQ_NONE;
769		772
770	if(priv->hwapi->pfnQueryInterrupt(priv->hwapi->pADCX))	773	if(priv->hwapi->pfnQueryInterrupt(priv->hwapi->pADCX))
771	{	774	{
Lines 776-781 Link Here
776		779
777	PRINTK(DEBUG_INTR, "nvnet_interrupt - Out\n");	780	PRINTK(DEBUG_INTR, "nvnet_interrupt - Out\n");
778		781
		782	return IRQ_HANDLED;
		783
779	}	784	}
780		785
781	static int nvnet_close(struct net_device *dev)	786	static int nvnet_close(struct net_device *dev)
Lines 1127-1132 Link Here
1127	priv->pdev = pdev;	1132	priv->pdev = pdev;
1128		1133
1129	SET_MODULE_OWNER(dev);	1134	SET_MODULE_OWNER(dev);
		1135	SET_NETDEV_DEV(dev, &pdev->dev);
1130	priv->regs = (char *)memptr;	1136	priv->regs = (char *)memptr;
1131	pci_set_master(pdev);	1137	pci_set_master(pdev);
1132		1138
Lines 1245-1251 Link Here
1245	*/	1251	*/
1246	static void __devexit nvnet_remove(struct pci_dev *pdev)	1252	static void __devexit nvnet_remove(struct pci_dev *pdev)
1247	{	1253	{
1248	struct net_device *dev = pdev->driver_data;	1254	struct net_device *dev = pci_get_drvdata (pdev);
1249	struct nvnet_private *priv = dev->priv;	1255	struct nvnet_private *priv = dev->priv;
1250	int i;	1256	int i;
1251		1257

Lines 104-110 Link Here

(-)nvnet/nvnet.h (-1 / +1 lines)
104	static struct net_device_stats nvnet_stats(struct net_device dev);	104	static struct net_device_stats nvnet_stats(struct net_device dev);
105	static int nvnet_config(struct net_device dev, struct ifmap map);	105	static int nvnet_config(struct net_device dev, struct ifmap map);
106	static int nvnet_init(struct net_device *dev);	106	static int nvnet_init(struct net_device *dev);
107	static void nvnet_interrupt(int irq, void dev_instance, struct pt_regs regs);	107	static irqreturn_t nvnet_interrupt(int irq, void dev_instance, struct pt_regs regs);
108	static void nvnet_multicast(struct net_device *dev);	108	static void nvnet_multicast(struct net_device *dev);
109		109
110	typedef enum {fail, pass} result; /* Boolean pass/fail results */	110	typedef enum {fail, pass} result; /* Boolean pass/fail results */

Return to bug 27208

Lines 21-27 Link Here

(-)nvnet/Makefile (-6 / +14 lines)
21	#	21	#
22	# Target	22	# Target
23	#	23	#
24	TARGET = $(MODULE_NAME).o	24	TARGET = $(MODULE_NAME).ko
25		25
26	#	26	#
27	# Networking library	27	# Networking library
Lines 76-82 Link Here
76	CFLAGS = -c -Wall -DLINUX -DMODULE -DEXPORT_SYMTAB -D__KERNEL__ -O \	76	CFLAGS = -c -Wall -DLINUX -DMODULE -DEXPORT_SYMTAB -D__KERNEL__ -O \
77	-Wstrict-prototypes -DCONFIG_PM -fno-strict-aliasing \	77	-Wstrict-prototypes -DCONFIG_PM -fno-strict-aliasing \
78	-mpreferred-stack-boundary=2 -march=i686 $(ALIGN) \	78	-mpreferred-stack-boundary=2 -march=i686 $(ALIGN) \
79	-DMODULE -I$(SYSINCLUDE) $(ARCHDEFS)	79	-DKBUILD_BASENAME=nvnet -DKBUILD_MODNAME=nvnet -fno-common \
		80	-DMODULE -I$(SYSINCLUDE) -I$(SYSINCLUDE)/asm/mach-default $(ARCHDEFS)
80		81
81	#	82	#
82	# Kernel version	83	# Kernel version
Lines 103-112 Link Here
103		104
104	all: $(TARGET)	105	all: $(TARGET)
105		106
106	$(TARGET): $(SRC) $(NVNETLIB) $(MCPINCLUDE)	107	nvnet.o: $(SRC)
107	$(CC) $(CFLAGS) $(SRC)	108	$(CC) $(CFLAGS) $(SRC)
108	ld -r -o $(TEMP) $(OBJ) $(NVNETLIB)	109
109	$(OBJCOPY) --strip-symbol="gcc2_compiled." $(TEMP)	110	nvnet.mod.c: nvnet.o
		111	$(KERNSRC)/scripts/modpost nvnet.o
		112
		113	nvnet.mod.o: nvnet.mod.c
		114	$(CC) $(CFLAGS) nvnet.mod.c
		115
		116	$(TARGET): nvnet.o nvnet.mod.o $(NVNETLIB)
		117	ld -r -o $(TEMP) nvnet.o nvnet.mod.o $(NVNETLIB)
110	cp $(TEMP) $(TARGET)	118	cp $(TEMP) $(TARGET)
111	rm $(TEMP)	119	rm $(TEMP)
112		120
Lines 139-142 Link Here
139	# Delete generated files	147	# Delete generated files
140	#	148	#
141	clean:	149	clean:
142	rm -f $(TARGET)	150	rm -f $(TARGET) nvnet.o .mod.c .mod.o