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

Commit 7b3166db authored by Peter Chubb's avatar Peter Chubb Committed by Tony Luck
Browse files

[IA64] Cleanup HPSIM code (was: Re: Enable early console for Ski simulator) 



After my last patch we have a new header file for HP simulator use.
Here's code to use it for stuff that used to have `extern' statements
inline in the code.  Functionality should not change with this patch.

Signed-off-by: default avatarPeter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 8b713c67

arch/ia64/hp/sim/hpsim_console.c

+0 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ simcons_write (struct console *cons, const char *buf, unsigned count) 


static struct tty_driver *simcons_console_device (struct console *c, int *index)

{

	extern struct tty_driver *hp_simserial_driver;

	*index = c->index;

	return hp_simserial_driver;

}

arch/ia64/hp/sim/simeth.c

+3 −9
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
#include <linux/bitops.h>

#include <asm/system.h>

#include <asm/irq.h>

#include <asm/hpsim.h>



#include "hpsim_ssc.h"



#define SIMETH_RECV_MAX	10
@@ -35,12 +38,6 @@ 
#define SIMETH_FRAME_SIZE	ETH_FRAME_LEN





#define SSC_NETDEV_PROBE		100

#define SSC_NETDEV_SEND			101

#define SSC_NETDEV_RECV			102

#define SSC_NETDEV_ATTACH		103

#define SSC_NETDEV_DETACH		104



#define NETWORK_INTR			8



struct simeth_local {
@@ -124,9 +121,6 @@ simeth_probe (void) 
	return r;

}



extern long ia64_ssc (long, long, long, long, int);

extern void ia64_ssc_connect_irq (long intr, long irq);



static inline int

netdev_probe(char *name, unsigned char *ether)

{

arch/ia64/hp/sim/simscsi.c

+1 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/kernel.h>

#include <linux/timer.h>

#include <asm/irq.h>

#include "hpsim_ssc.h"



#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>
@@ -59,8 +60,6 @@ struct disk_stat { 
	unsigned count;

};



extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr);



static int desc[16] = {

	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1

};

include/asm-ia64/hpsim.h

+6 −0
Original line number Diff line number Diff line
@@ -7,4 +7,10 @@ static inline int simcons_register(void) { return 1; } 
int simcons_register(void);

#endif



struct tty_driver;

extern struct tty_driver *hp_simserial_driver;



void ia64_ssc_connect_irq(long intr, long irq);

void ia64_ctl_trace(long on);



#endif