fix adb breakage in xmon
PATCH 1/1 fix adb breakage in xmon
In reply to a message not in the archiveFix up xmon compilation after the last change.
Remove lots of dead code, all the pmac and chrp support is in arch/powerpc
Signed-off-by Olaf Hering <[email protected]>
arch/ppc/xmon/adb.c | 212 -------------------------------------------------- arch/ppc/xmon/start.c | 169 --------------------------------------- arch/ppc/xmon/xmon.c | 108 ------------------------- 3 files changed, 3 insertions(+), 486 deletions(-)
arch/ppc/xmon/start.c +3 -166
@@ -6,16 +6,11 @@#include <asm/machdep.h> #include <asm/io.h> #include <asm/page.h> -#include <linux/adb.h> -#include <linux/pmu.h> -#include <linux/cuda.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/sysrq.h> #include <linux/bitops.h> #include <asm/xmon.h> -#include <asm/prom.h> -#include <asm/bootx.h> #include <asm/machdep.h> #include <asm/errno.h> #include <asm/processor.h>
@@ -26,9 +21,7 @@ static volatile unsigned char *sccc, *scunsigned int TXRDY ,RXRDY ,DLAB ;static int xmon_expect (const char *str,unsigned int timeout); -static int use_screen;static int via_modem; -static int xmon_use_sccb;#define TB_SPEED 25000000
@@ -46,47 +39,6 @@ void buf_access(void) sccd[3 ] &= ~DLAB ;/* reset DLAB */ } -extern int adb_init (void ); - -#ifdef CONFIG_PPC_CHRP -/* -* This looks in the "ranges" property for the primary PCI host bridge -* to find the physical address of the start of PCI/ISA I/O space. -* It is basically a cut-down version of pci_process_bridge_OF_ranges. -*/ -static unsigned long chrp_find_phys_io_base (void ) -{ -struct device_node *node; -unsigned int *ranges; -unsigned long base =CHRP_ISA_IO_BASE ; -int rlen =0 ; -int np; - - node =find_devices ("isa" ); -if (node !=NULL ) { - node = node->parent; -if (node ==NULL || node->type ==NULL - ||strcmp (node->type,"pci" ) !=0 ) - node =NULL ; - } -if (node ==NULL ) - node =find_devices ("pci" ); -if (node ==NULL ) -return base; - - ranges = (unsigned int *)get_property (node,"ranges" , &rlen); - np =prom_n_addr_cells (node) +5 ; -while ((rlen -= np *sizeof (unsigned int )) >=0 ) { -if ((ranges[0 ] >>24 ) ==1 && ranges[2 ] ==0 ) { -/* I/O space starting at 0, grab the phys base */ - base = ranges[np -3 ]; -break ; - } - ranges += np; - } -return base; -} -#endif /* CONFIG_PPC_CHRP */ #ifdef CONFIG_MAGIC_SYSRQ static void sysrq_handle_xmon(int key, struct pt_regs *regs,
@@ -109,22 +61,6 @@ xmon_map_scc(void)#ifdef CONFIG_PPC_MULTIPLATFORM volatile unsigned char *base; -#ifdef CONFIG_PPC_CHRP - base = (volatile unsigned char *) isa_io_base; -if (_machine == _MACH_chrp) - base = (volatile unsigned char *) -ioremap (chrp_find_phys_io_base (),0x1000 ); - - sccc = base +0x3fd ; - sccd = base +0x3f8 ; -if (xmon_use_sccb) { - sccc -=0x100 ; - sccd -=0x100 ; - } -TXRDY =0x20 ; -RXRDY =1 ; -DLAB =0x80 ; -#endif /* CONFIG_PPC_CHRP */ #elif defined(CONFIG_GEMINI )/* should already be mapped by the kernel boot */ sccc = (volatile unsigned char *)0xffeffb0d ;
@@ -143,7 +79,7 @@ xmon_map_scc(void)register_sysrq_key ('x' , &sysrq_xmon_op); } -static int scc_initialized =0 ; +static int scc_initialized;void xmon_init_scc (void );
@@ -163,14 +99,6 @@ xmon_write(void *handle, void *ptr, intbreak ;#endif -#ifdef CONFIG_BOOTX_TEXT -if (use_screen) { -/* write it on the screen */ -for (i =0 ; i < nb; ++i) -btext_drawchar (*p++); - goto out; - } -#endif if (!scc_initialized)xmon_init_scc (); ct =0 ;
@@ -190,7 +118,6 @@ xmon_write(void *handle, void *ptr, inteieio (); } - out:#ifdef CONFIG_SMP if (!locked)clear_bit (0 , &xmon_write_lock);
@@ -199,65 +126,7 @@ xmon_write(void *handle, void *ptr, int }int xmon_wants_key; -int xmon_adb_keycode; - -#ifdef CONFIG_BOOTX_TEXT -static int xmon_adb_shiftstate; -static unsigned char xmon_keytab[128 ] = -"asdfhgzxcv\000bqwer" /* 0x00 - 0x0f */ -"yt123465=97-80]o" /* 0x10 - 0x1f */ -"u[ip\rlj'k;\\,/nm." /* 0x20 - 0x2f */ -"\t `\177\0\033\0\0\0\0\0\0\0\0\0\0" /* 0x30 - 0x3f */ -"\0.\0*\0+\0\0\0\0\0/\r\0-\0" /* 0x40 - 0x4f */ -"\0\0000123456789\0\0\0" ;/* 0x50 - 0x5f */ - -static unsigned char xmon_shift_keytab[128 ] = -"ASDFHGZXCV\000BQWER" /* 0x00 - 0x0f */ -"YT!@#$^%+(&_*)}O" /* 0x10 - 0x1f */ -"U{IP\rLJ\"K:|<?NM>" /* 0x20 - 0x2f */ -"\t ~\177\0\033\0\0\0\0\0\0\0\0\0\0" /* 0x30 - 0x3f */ -"\0.\0*\0+\0\0\0\0\0/\r\0-\0" /* 0x40 - 0x4f */ -"\0\0000123456789\0\0\0" ;/* 0x50 - 0x5f */ - -static int -xmon_get_adb_key (void ) -{ -int k, t, on; - - xmon_wants_key =1 ; -for (;;) { - xmon_adb_keycode =-1 ; - t =0 ; - on =0 ; -do { -if (--t <0 ) { - on =1 - on; -btext_drawchar (on?0xdb :0x20 ); -btext_drawchar ('\b' ); - t =200000 ; - } -do_poll_adb (); - }while (xmon_adb_keycode ==-1 ); - k = xmon_adb_keycode; -if (on) -btext_drawstring (" \b" ); - -/* test for shift keys */ -if ((k &0x7f ) ==0x38 || (k &0x7f ) ==0x7b ) { - xmon_adb_shiftstate = (k &0x80 ) ==0 ; -continue ; - } -if (k >=0x80 ) -continue ;/* ignore up transitions */ - k = (xmon_adb_shiftstate? xmon_shift_keytab: xmon_keytab)[k]; -if (k !=0 ) -break ; - } - xmon_wants_key =0 ; -return k; -} -#endif /* CONFIG_BOOTX_TEXT */ int xmon_read (void *handle,void *ptr,int nb)
@@ -265,18 +134,11 @@ xmon_read(void *handle, void *ptr, int nchar *p = ptr;int i; -#ifdef CONFIG_BOOTX_TEXT -if (use_screen) { -for (i =0 ; i < nb; ++i) - *p++ =xmon_get_adb_key (); -return i; - } -#endif if (!scc_initialized)xmon_init_scc ();for (i =0 ; i < nb; ++i) {while ((*sccc &RXRDY ) ==0 ) -do_poll_adb (); + ;buf_access (); *p++ = *sccd; }
@@ -287,7 +149,7 @@ intxmon_read_poll (void) {if ((*sccc &RXRDY ) ==0 ) { -do_poll_adb (); + ;return -1 ; }buf_access ();
@@ -297,15 +159,6 @@ xmon_read_poll(void)void xmon_init_scc (void ) { -if ( _machine == _MACH_chrp ) - { - sccd[3 ] =0x83 ;eieio ();/* LCR = 8N1 + DLAB */ - sccd[0 ] =12 ;eieio ();/* DLL = 9600 baud */ - sccd[1 ] =0 ;eieio (); - sccd[2 ] =0 ;eieio ();/* FCR = 0 */ - sccd[3 ] =3 ;eieio ();/* LCR = 8N1 */ - sccd[1 ] =0 ;eieio ();/* IER = 0 */ - } scc_initialized =1 ;if (via_modem) {for (;;) {
@@ -321,22 +174,6 @@ xmon_init_scc(void) } } -#if 0 -extern int (*prom_entry)(void *); - -int -xmon_exit (void ) -{ -struct prom_args { -char *service; - } args; - -for (;;) { - args.service ="exit" ; - (*prom_entry)(&args); - } -} -#endif void *xmon_stdin;void *xmon_stdout;
arch/ppc/xmon/adb.c deleted +0 -212
212 lines not on this page · raw message
arch/ppc/xmon/xmon.c +0 -108
144 lines not on this page · raw message