Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c4b562a authored by Adrian Bunk's avatar Adrian Bunk Committed by Adrian Bunk
Browse files

Move ip2.c and ip2main.c to drivers/char/ip2/ where the other files 


used by this driver reside.

Renamed ip2.c to ip2base.c to allow ip2.o to be built from multiple
objects.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarMichael H. Warfield <mhw@WittsEnd.com>
parent 0f36b018

drivers/char/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ obj-$(CONFIG_MOXA_INTELLIO) += moxa.o 
obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o

obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o

obj-$(CONFIG_MOXA_SMARTIO)	+= mxser.o

obj-$(CONFIG_COMPUTONE)		+= ip2.o ip2main.o

obj-$(CONFIG_COMPUTONE)		+= ip2/

obj-$(CONFIG_RISCOM8)		+= riscom8.o

obj-$(CONFIG_ISI)		+= isicom.o

obj-$(CONFIG_SYNCLINK)		+= synclink.o

drivers/char/ip2/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#

# Makefile for the Computone IntelliPort Plus Driver

#



obj-$(CONFIG_COMPUTONE)         += ip2.o ip2main.o



ip2-objs			:= ip2base.o

drivers/char/ip2.c→drivers/char/ip2/ip2base.c

+3 −3
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ 
#define __initdata

#endif



#include "./ip2/ip2types.h"		

#include "./ip2/fip_firm.h"		// the meat

#include "ip2types.h"		

#include "fip_firm.h"		// the meat



int

ip2_loadmain(int *, int  *, unsigned char *, int ); // ref into ip2main.c



/* Note: Add compiled in defaults to these arrays, not to the structure

	in ip2/ip2.h any longer.  That structure WILL get overridden

	in ip2.h any longer.  That structure WILL get overridden

	by these values, or command line values, or insmod values!!!  =mhw=

*/

static int io[IP2_MAX_BOARDS]= { 0, 0, 0, 0 };

drivers/char/ip2main.c→drivers/char/ip2/ip2main.c

+10 −10
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
// Clean up potential NULL pointer dereferences

// Clean up devfs registration

// Add kernel command line parsing for io and irq

//	Compile defaults for io and irq are now set in ip2.c not ip2/ip2.h!

//	Compile defaults for io and irq are now set in ip2.c not ip2.h!

// Reworked poll_only hack for explicit parameter setting

//	You must now EXPLICITLY set poll_only = 1 or set all irqs to 0

// Merged ip2_loadmain and old_ip2_init
@@ -123,12 +123,12 @@ 


#include <asm/uaccess.h>



#include "./ip2/ip2types.h"

#include "./ip2/ip2trace.h"

#include "./ip2/ip2ioctl.h"

#include "./ip2/ip2.h"

#include "./ip2/i2ellis.h"

#include "./ip2/i2lib.h"

#include "ip2types.h"

#include "ip2trace.h"

#include "ip2ioctl.h"

#include "ip2.h"

#include "i2ellis.h"

#include "i2lib.h"



/*****************

 * /proc/ip2mem  *
@@ -282,9 +282,9 @@ static int tracewrap; 
/* Code */

/********/



#include "./ip2/i2ellis.c"    /* Extremely low-level interface services */

#include "./ip2/i2cmd.c"      /* Standard loadware command definitions */

#include "./ip2/i2lib.c"      /* High level interface services */

#include "i2ellis.c"    /* Extremely low-level interface services */

#include "i2cmd.c"      /* Standard loadware command definitions */

#include "i2lib.c"      /* High level interface services */



/* Configuration area for modprobe */