linuxsh-dev

Re: [linuxsh-dev] HP600 patch

[YAEGASHI T. <yae...@ma...>]

Thanks for your comments.

> YAEGASHI Takeshi wrote:
>  > Ok, here is the patch against linux-sh-2000-06-05.diff.gz from
>  > m17n.org, please review it.  I'll appreciate all your coments
>  > and suggestions.
> 
> Great.  Please check it in.  Except:
> 
>  > +++ linux/arch/sh/Makefile	Tue Jun  6 17:38:52 2000
> 
> This one.  I support RMS for the name of GNU/Linux. :-)

Oh I'm sorry, I intend no discussion on this.  Simply I forgot
to remove this one by hand.

I don't have any strong opinion about this.  But when I built
Debian cross packages in m17.org I adopted sh-linux- prefix,
because our FAQ and other Debian cross packages(such as
gcc-m68k-linux) do so.

In practice, which should I choose for Debian packages?  I'm
planning to contribute these to Debian Project before long.


> Besides, I'm not sure hd64461_{inw,outw} is worth or not.  We may enhance
> the generic I/O routine to support more than two offsets.

Well I see.  I'm going to write io_hd64461.c or such to support
other devices in HD64461 and PCMCIA.

--
YAEGASHI Takeshi <yae...@ma...>

[linuxsh-dev] HP600 patch

[NIIBE Y. <gn...@ch...>]

YAEGASHI Takeshi wrote:
 > Ok, here is the patch against linux-sh-2000-06-05.diff.gz from
 > m17n.org, please review it.  I'll appreciate all your coments
 > and suggestions.

Great.  Please check it in.  Except:

 > +++ linux/arch/sh/Makefile	Tue Jun  6 17:38:52 2000

This one.  I support RMS for the name of GNU/Linux. :-)


 > diff -ruN linux-2.4.0-test1.orig/arch/sh/kernel/irq.c linux/arch/sh/kernel/irq.c
 > --- linux-2.4.0-test1.orig/arch/sh/kernel/irq.c	Mon May 22 12:55:06 2000
 > +++ linux/arch/sh/kernel/irq.c	Tue Jun  6 17:36:10 2000
 > @@ -37,6 +37,9 @@
 >  #include <asm/irq.h>
 >  #include <linux/irq.h>
 >  
 > +#ifdef CONFIG_HD64461
 > +#include <asm/hd64461.h>
 > +#endif
 >  
 >  unsigned int local_bh_count[NR_CPUS];
 >  unsigned int local_irq_count[NR_CPUS];
 > @@ -243,6 +246,18 @@
 >  		     "shlr	%0\n\t"
 >  		     "add	#-16, %0\n\t"
 >  		     :"=z" (irq));
 > +#if defined(CONFIG_HD64461)
 > +	if (irq == CONFIG_HD64461_IRQ) {
 > +		unsigned short bit=1;
 > +		unsigned short nirr = hd64461_inw(HD64461_NIRR);
 > +		unsigned short nimr = hd64461_inw(HD64461_NIMR);
 > +		nirr &= ~nimr;
 > +		for (bit = 1, irq = 0; irq < 16; bit <<= 1, irq++)
 > +			if (nirr & bit) break;
 > +		if (irq == 16) irq = CONFIG_HD64461_IRQ;
 > +		else irq += HD64461_IRQBASE;
 > +	}
 > +#endif
 >  
 >  	kstat.irqs[cpu][irq]++;
 >  	desc = irq_desc + irq;

OK.  You virtualize the HP64461_IRQ.  I think this is good approach.


 > diff -ruN linux-2.4.0-test1.orig/drivers/char/sh-sci.h linux/drivers/char/sh-sci.h
 > --- linux-2.4.0-test1.orig/drivers/char/sh-sci.h	Tue Jun  6 18:35:53 2000
 > +++ linux/drivers/char/sh-sci.h	Tue Jun  6 17:42:41 2000
 > @@ -202,7 +202,11 @@
 >   */
 >  #if defined(__sh3__)
 >  #if defined(CONFIG_CPU_SUBTYPE_SH7709)
 > +#ifdef CONFIG_SH_HP600
 > +#define PCLK           22222222
 > +#else
 >  #define PCLK           33333333
 > +#endif
 >  #else
 >  #define PCLK           14745600	/* Isn't it 15MHz? */
 >  #endif

Could you please resolve this issue with Stuart.  It seems that
his changes are not yet checked it in.

Besides, I'm not sure hd64461_{inw,outw} is worth or not.  We may enhance
the generic I/O routine to support more than two offsets.

And please make sure that let Mihai Spatar know his code is now included
(for hitfb.c).

For now, please check them in and go ahead.
-- 

[linuxsh-dev] HP600 patch

[YAEGASHI T. <yae...@ma...>]

Developers,

Ok, here is the patch against linux-sh-2000-06-05.diff.gz from
m17n.org, please review it.  I'll appreciate all your coments
and suggestions.

Regards,
--
YAEGASHI Takeshi <yae...@ma...>


diff -ruN linux-2.4.0-test1.orig/ChangeLog linux/ChangeLog
--- linux-2.4.0-test1.orig/ChangeLog	Tue Jun  6 18:35:53 2000
+++ linux/ChangeLog	Tue Jun  6 19:12:23 2000
@@ -1,3 +1,35 @@
+2000-06-06  YAEGASHI Takeshi  <yae...@ma...>
+
+	* include/asm-sh/linux_logo.h: Needed for the frame buffer console.
+	Would anyone design and contribute our logo? :->
+
+	* net/ipv4/ipconfig.c: Remove inclusion of <asm/segment.h>.
+
+	* drivers/char/Makefile, include/asm-sh/keyboard.h,
+	drivers/char/scan_keyb.c, drivers/char/scan_keyb.h,
+	drivers/char/hp600_keyb.c: Add generic scan keyboard driver and
+	HP690 scan code table.
+
+	* arch/sh/kernel/Makefile, arch/sh/kernel/hd64461.c,
+	include/asm-sh/hd64461.h, arch/sh/kernel/irq.c: Add support for
+	HD64461 companion chip.
+
+	* drivers/video/Config.in, drivers/video/Makefile,
+	drivers/video/fbmem.c, drivers/video/hitfb.c: Add support for
+	HD64461 frame buffer.
+
+	* drivers/char/vt.c: Add !defined(__sh__) to the #if conditionals to
+	avoid sys_ioperm().
+
+	* arch/sh/kernel/time.c, drivers/char/sh-sci.h,
+	include/asm-sh/ide.h: ad hoc work around for HP690...
+	
+	* arch/sh/config.in: introduce new configs: CONFIG_SH_HP600,
+	CONFIG_HD64461, and so on.
+
+	* arch/sh/boot/compressed/Makefile: my kernel is now bigger than
+	1MB...
+
 2000-06-02  NIIBE Yutaka  <gn...@m1...>
 
 	* arch/sh/kernel/entry.S (Throughout): Use ".align 2" instead
diff -ruN linux-2.4.0-test1.orig/arch/sh/Makefile linux/arch/sh/Makefile
--- linux-2.4.0-test1.orig/arch/sh/Makefile	Tue Jun  6 18:35:53 2000
+++ linux/arch/sh/Makefile	Tue Jun  6 17:38:52 2000
@@ -15,7 +15,7 @@
 #
 # Select the object file format to substitute into the linker script.
 #
-tool-prefix	= sh-linux-gnu-
+tool-prefix	= sh-linux-
 
 ifdef CONFIG_LITTLE_ENDIAN
 CFLAGS		+= -ml
diff -ruN linux-2.4.0-test1.orig/arch/sh/boot/compressed/Makefile linux/arch/sh/boot/compressed/Makefile
--- linux-2.4.0-test1.orig/arch/sh/boot/compressed/Makefile	Tue Jun  6 18:35:53 2000
+++ linux/arch/sh/boot/compressed/Makefile	Tue Jun  6 17:36:10 2000
@@ -14,7 +14,7 @@
 #
 # ZIMAGE_OFFSET is the load offset of the compression loader
 #
-ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[0x80000000+0x$(CONFIG_MEMORY_START)+0x100000])
+ZIMAGE_OFFSET = $(shell printf "0x%8x" $$[0x80000000+0x$(CONFIG_MEMORY_START)+0x200000])
 
 ZLINKFLAGS = -Ttext $(ZIMAGE_OFFSET) $(ZLDFLAGS)
 
diff -ruN linux-2.4.0-test1.orig/arch/sh/config.in linux/arch/sh/config.in
--- linux-2.4.0-test1.orig/arch/sh/config.in	Sun May 21 04:05:29 2000
+++ linux/arch/sh/config.in	Tue Jun  6 17:36:10 2000
@@ -17,7 +17,8 @@
 comment 'Processor type and features'
 choice 'SuperH system type'					\
 	"Generic		CONFIG_SH_GENERIC		\
-	 SolutionEngine		CONFIG_SH_SOLUTION_ENGINE" Generic
+	 SolutionEngine		CONFIG_SH_SOLUTION_ENGINE	\
+	 HP600			CONFIG_SH_HP600" Generic
 
 choice 'Processor type' \
    "SH7708 CONFIG_CPU_SUBTYPE_SH7708 \
@@ -61,8 +62,15 @@
 
 bool 'Networking support' CONFIG_NET
 
-if [ "$CONFIG_SH_SOLUTION_ENGINE" != "y" ]; then
+if [ "$CONFIG_SH_SOLUTION_ENGINE" != "y" -a "$CONFIG_SH_HP600" != "y" ]; then
    bool 'Directly Connected Compact Flash support' CONFIG_CF_ENABLER
+fi
+
+bool 'Hitachi HD64461 companion chip support' CONFIG_HD64461
+if [ "$CONFIG_HD64461" = "y" ]; then
+   hex 'HD64461 I/O base address' CONFIG_HD64461_IOBASE b0000000
+   int 'HD64461 IRQ' CONFIG_HD64461_IRQ 36
+   bool 'HD64461 PCMCIA enabler' CONFIG_HD64461_ENABLER
 fi
 
 bool 'PCI support' CONFIG_PCI
diff -ruN linux-2.4.0-test1.orig/arch/sh/kernel/Makefile linux/arch/sh/kernel/Makefile
--- linux-2.4.0-test1.orig/arch/sh/kernel/Makefile	Sun May 21 04:05:29 2000
+++ linux/arch/sh/kernel/Makefile	Tue Jun  6 17:36:10 2000
@@ -28,8 +28,16 @@
 O_OBJS += setup_se.o io_se.o
 endif
 
+ifdef CONFIG_SH_HP600
+O_OBJS += io_generic.o
+endif
+
 ifdef CONFIG_CPU_SH4
 O_OBJS += fpu.o
+endif
+
+ifdef CONFIG_HD64461
+O_OBJS += hd64461.o
 endif
 
 all: kernel.o head.o init_task.o
diff -ruN linux-2.4.0-test1.orig/arch/sh/kernel/hd64461.c linux/arch/sh/kernel/hd64461.c
--- linux-2.4.0-test1.orig/arch/sh/kernel/hd64461.c	Thu Jan  1 09:00:00 1970
+++ linux/arch/sh/kernel/hd64461.c	Tue Jun  6 17:36:10 2000
@@ -0,0 +1,126 @@
+/*
+ *	$Id$
+ *	Copyright (C) 2000 YAEGASHI Takeshi
+ *	Hitachi HD64461 companion chip support
+ */
+
+#include <linux/config.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>
+#include <linux/param.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include <asm/hd64461.h>
+
+static void disable_hd64461_irq(unsigned int irq)
+{
+	unsigned long flags;
+	unsigned short nimr;
+	unsigned short mask = 1 << (irq - HD64461_IRQBASE);
+
+	save_and_cli(flags);
+	nimr = hd64461_inw(HD64461_NIMR);
+	nimr |= mask;
+	hd64461_outw(nimr, HD64461_NIMR);
+	restore_flags(flags);
+}
+
+
+static void enable_hd64461_irq(unsigned int irq)
+{
+	unsigned long flags;
+	unsigned short nimr;
+	unsigned short mask = 1 << (irq - HD64461_IRQBASE);
+
+	save_and_cli(flags);
+	nimr = hd64461_inw(HD64461_NIMR);
+	nimr &= ~mask;
+	hd64461_outw(nimr, HD64461_NIMR);
+	restore_flags(flags);
+}
+
+
+static void mask_and_ack_hd64461(unsigned int irq)
+{
+	disable_hd64461_irq(irq);
+#ifdef CONFIG_HD64461_ENABLER
+	if (irq == HD64461_IRQBASE + 13)
+		hd64461_outb(0x00, HD64461_PCC1CSCR);
+#endif
+}
+
+
+static void end_hd64461_irq(unsigned int irq)
+{
+	enable_hd64461_irq(irq);
+}
+
+
+static unsigned int startup_hd64461_irq(unsigned int irq)
+{ 
+	enable_hd64461_irq(irq);
+	return 0;
+}
+
+
+static void shutdown_hd64461_irq(unsigned int irq)
+{
+	disable_hd64461_irq(irq);
+}
+
+
+static struct hw_interrupt_type hd64461_irq_type = {
+	"HD64461-IRQ",
+	startup_hd64461_irq,
+	shutdown_hd64461_irq,
+	enable_hd64461_irq,
+	disable_hd64461_irq,
+	mask_and_ack_hd64461,
+	end_hd64461_irq
+};
+
+
+static void hd64461_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+	printk(KERN_INFO
+	       "HD64461: spurious interrupt, nirr: 0x%lx nimr: 0x%lx\n",
+	       hd64461_inw(HD64461_NIRR), hd64461_inw(HD64461_NIMR));
+}
+
+
+static struct irqaction irq0  = { hd64461_interrupt, SA_INTERRUPT, 0, "HD64461", NULL, NULL};
+
+
+static void __init setup_hd64461(void)
+{
+	int i;
+
+	printk(KERN_INFO "HD64461 at 0x%x on irq %d (%d - %d)\n",
+	       CONFIG_HD64461_IOBASE, CONFIG_HD64461_IRQ,
+	       HD64461_IRQBASE, HD64461_IRQBASE+15);
+#if 1
+	/* IRQ line for HD64461 should be set level trigger mode("10"). */
+	/* And this should be done earlier than kernel starts. */
+	ctrl_outw(0x0200, INTC_ICR1); /* when connected to IRQ4. */
+#endif
+	hd64461_outw(0xffff, HD64461_NIMR);
+
+	for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++) {
+		irq_desc[i].handler = &hd64461_irq_type;
+	}
+
+	setup_irq(CONFIG_HD64461_IRQ, &irq0);
+
+#ifdef CONFIG_HD64461_ENABLER
+	printk(KERN_INFO "HD64461: enabling PCMCIA devices\n");
+	hd64461_outb(0x04, HD64461_PCC1CSCIER);
+	hd64461_outb(0x00, HD64461_PCC1CSCR);
+#endif
+}
+
+module_init(setup_hd64461);
diff -ruN linux-2.4.0-test1.orig/arch/sh/kernel/irq.c linux/arch/sh/kernel/irq.c
--- linux-2.4.0-test1.orig/arch/sh/kernel/irq.c	Mon May 22 12:55:06 2000
+++ linux/arch/sh/kernel/irq.c	Tue Jun  6 17:36:10 2000
@@ -37,6 +37,9 @@
 #include <asm/irq.h>
 #include <linux/irq.h>
 
+#ifdef CONFIG_HD64461
+#include <asm/hd64461.h>
+#endif
 
 unsigned int local_bh_count[NR_CPUS];
 unsigned int local_irq_count[NR_CPUS];
@@ -243,6 +246,18 @@
 		     "shlr	%0\n\t"
 		     "add	#-16, %0\n\t"
 		     :"=z" (irq));
+#if defined(CONFIG_HD64461)
+	if (irq == CONFIG_HD64461_IRQ) {
+		unsigned short bit=1;
+		unsigned short nirr = hd64461_inw(HD64461_NIRR);
+		unsigned short nimr = hd64461_inw(HD64461_NIMR);
+		nirr &= ~nimr;
+		for (bit = 1, irq = 0; irq < 16; bit <<= 1, irq++)
+			if (nirr & bit) break;
+		if (irq == 16) irq = CONFIG_HD64461_IRQ;
+		else irq += HD64461_IRQBASE;
+	}
+#endif
 
 	kstat.irqs[cpu][irq]++;
 	desc = irq_desc + irq;
diff -ruN linux-2.4.0-test1.orig/arch/sh/kernel/time.c linux/arch/sh/kernel/time.c
--- linux-2.4.0-test1.orig/arch/sh/kernel/time.c	Sun May 21 04:05:29 2000
+++ linux/arch/sh/kernel/time.c	Tue Jun  6 17:38:38 2000
@@ -421,7 +421,11 @@
 		tmp  = (frqcr & 0x2000) >> 11;
 		tmp |= frqcr & 0x0003;
 		pfc = pfc_table[tmp];
+#ifdef CONFIG_SH_HP600
+		master_clock = cpu_clock/6;
+#else
 		master_clock = cpu_clock;
+#endif
 		bus_clock = master_clock/pfc;
 	}
 #elif defined(__SH4__)
diff -ruN linux-2.4.0-test1.orig/drivers/char/Makefile linux/drivers/char/Makefile
--- linux-2.4.0-test1.orig/drivers/char/Makefile	Sun May 21 04:07:56 2000
+++ linux/drivers/char/Makefile	Tue Jun  6 17:36:10 2000
@@ -73,6 +73,11 @@
   KEYBD    =
   CONSOLE  =
   SERIAL =
+  ifeq ($(CONFIG_SH_HP600),y)
+  KEYMAP   = defkeymap.o
+  KEYBD    = scan_keyb.o hp600_keyb.o
+  CONSOLE  = console.o
+  endif
   ifeq ($(CONFIG_SERIAL),y)
   SERIAL = generic_serial.o sh-sci.o
   else
diff -ruN linux-2.4.0-test1.orig/drivers/char/hp600_keyb.c linux/drivers/char/hp600_keyb.c
--- linux-2.4.0-test1.orig/drivers/char/hp600_keyb.c	Thu Jan  1 09:00:00 1970
+++ linux/drivers/char/hp600_keyb.c	Tue Jun  6 17:36:10 2000
@@ -0,0 +1,119 @@
+/*
+ *	$Id$ 
+ *	Copyright (C) 2000 YAEGASHI Takeshi
+ *	HP600 keyboard scan routine and translate table
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/io.h>
+#include "scan_keyb.h"
+
+#define PCDR 0xa4000124
+#define PDDR 0xa4000126
+#define PEDR 0xa4000128
+#define PFDR 0xa400012a
+#define PGDR 0xa400012c
+#define PHDR 0xa400012e
+
+static const unsigned char hp690_japanese_table[]={
+	0x00, 0x00, 0x00, 0x01, 0x00, 0x29, 0x70, 0x3a,
+	0x3f, 0x3e, 0x40, 0x41, 0x42, 0x3d, 0x3c, 0x3b,
+
+	0x00, 0x00, 0x00, 0x2c, 0x00, 0x1c, 0x28, 0x35,
+	0x31, 0x30, 0x32, 0x33, 0x34, 0x2f, 0x2e, 0x2d,
+
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x50,
+	0x7b, 0x38, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00,
+
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xf9, 0x73, 0x53, 0x39, 0x00, 0x1d,
+
+	0x00, 0x00, 0x00, 0x1e, 0x00, 0x2b, 0x1b, 0x27,
+	0x23, 0x22, 0x24, 0x25, 0x26, 0x21, 0x20, 0x1f,
+
+	0x00, 0x00, 0x00, 0x0f, 0x00, 0x36, 0x7d, 0x48,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2a, 0x00,
+
+	0x00, 0x00, 0x00, 0x10, 0x00, 0x0e, 0x1a, 0x19,
+	0x15, 0x14, 0x16, 0x17, 0x18, 0x13, 0x12, 0x11,
+
+	0x00, 0x00, 0x00, 0x02, 0x00, 0x0d, 0x0c, 0x0b,
+	0x07, 0x06, 0x08, 0x09, 0x0a, 0x05, 0x04, 0x03,
+
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+
+static void hp690_japanese_scan_kbd(unsigned char *s)
+{
+	ctrl_outb(0xfd, PDDR); ctrl_outb(0xff, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	ctrl_outb(0xdf, PDDR); ctrl_outb(0xff, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	ctrl_outb(0x7f, PDDR); ctrl_outb(0xff, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	ctrl_outb(0xff, PDDR); ctrl_outb(0xfe, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	ctrl_outb(0xff, PDDR); ctrl_outb(0xfd, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	ctrl_outb(0xff, PDDR); ctrl_outb(0xf7, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	ctrl_outb(0xff, PDDR); ctrl_outb(0xbf, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	ctrl_outb(0xff, PDDR); ctrl_outb(0x7f, PEDR);
+	*s++=ctrl_inb(PCDR); *s++=ctrl_inb(PFDR);
+	*s++=ctrl_inb(PGDR); *s++=ctrl_inb(PHDR);
+}
+
+
+void __init hp600_kbd_init_hw(void)
+{
+	scan_kbd_init();
+	register_scan_keyboard(hp690_japanese_scan_kbd,
+			       hp690_japanese_table, 18);
+	printk(KERN_INFO "HP600 matrix scan keyboard registered\n");
+}
+
+
+/****************************************************************
+HP Jornada 690(Japanese version) keyboard scan matrix
+
+	PTC7	PTC6	PTC5	PTC4	PTC3	PTC2	PTC1	PTC0	
+PTD1	REC			Escape	on/off	Han/Zen	Hira	Eisu	
+PTD5	REC			Z	on/off	Enter	:	/	
+PTD7	REC						Right	Down	
+PTE0	REC			Windows	on/off				
+PTE1	REC			A	on/off	]	[	;	
+PTE3	REC			Tab	on/off	ShirtR	\	Up	
+PTE6	REC			Q	on/off	BS	@	P	
+PTE7	REC			1	on/off	^	-	0	
+
+
+	PTF7	PTF6	PTF5	PTF4	PTF3	PTF2	PTF1	PTF0
+PTD1	F5	F4	F6	F7	F8	F3	F2	F1	
+PTD5	N	B	M	,	.	V	C	X	
+PTD7	Muhen	Alt			Left				
+PTE0			Henkan	_	Del	Space		Ctrl	
+PTE1	H	G	J	K	L	F	D	S	
+PTE3							ShiftL		
+PTE6	Y	T	U	I	O	R	E	W	
+PTE7	6	5	7	8	9	4	3	2	
+
+	PTG5	PTG4	PTG3	PTG0	PTH0
+*	REC	REW	FWW	Cover	on/off
+
+
+		7	6	5	4	3	2	1	0
+C: 0xffff 0xdf	IP	IP	IP	IP	IP	IP	IP	IP
+D: 0x6786 0x59	O	I	O	IP	I	F	O	I
+E: 0x5045 0x00	O	O	F	F	O	F	O	O
+F: 0xffff 0xff	IP	IP	IP	IP	IP	IP	IP	IP
+G: 0xaffe 0xfd	I	I	IP	IP	IP	IP	IP	I
+H: 0x70f2 0x49	O	IP	F	F	IP	IP	F	I
+J: 0x0704 0x22	F	F	O	IP	F	F	O	F
+K: 0x0100 0x10	F	F	F	O	F	F	F	F
+L: 0x0c3c 0x26	F	F	IP	F	F	IP	IP	F
+
+****************************************************************/
diff -ruN linux-2.4.0-test1.orig/drivers/char/scan_keyb.c linux/drivers/char/scan_keyb.c
--- linux-2.4.0-test1.orig/drivers/char/scan_keyb.c	Thu Jan  1 09:00:00 1970
+++ linux/drivers/char/scan_keyb.c	Tue Jun  6 17:37:17 2000
@@ -0,0 +1,129 @@
+/*
+ *	$Id$ 
+ *	Copyright (C) 2000 YAEGASHI Takeshi
+ *	Generic scan keyboard driver
+ */
+
+#include <linux/config.h>
+
+#include <linux/spinlock.h>
+#include <linux/sched.h>
+#include <linux/interrupt.h>
+#include <linux/tty.h>
+#include <linux/mm.h>
+#include <linux/signal.h>
+#include <linux/init.h>
+#include <linux/kbd_ll.h>
+#include <linux/delay.h>
+#include <linux/random.h>
+#include <linux/poll.h>
+#include <linux/miscdevice.h>
+#include <linux/malloc.h>
+#include <linux/kbd_kern.h>
+
+struct scan_keyboard {
+	struct scan_keyboard *next;
+	void (*scan)(unsigned char *buffer);
+	const unsigned char *table;
+	unsigned char *s0, *s1;
+	int length;
+};
+		     
+static struct scan_keyboard *keyboards=NULL;
+static struct tq_struct task_scan_kbd;	
+
+static void check_kbd(const unsigned char *table,
+		      unsigned char *new, unsigned char *old, int length)
+{
+	int need_tasklet_schedule=0;
+	unsigned char xor, bit;
+	
+	while(length-->0) {
+		if((xor=*new^*old)==0) {
+			table+=8;
+		}
+		else {
+			for(bit=0x80; bit!=0; bit>>=1) {
+				if(xor&bit) {
+					handle_scancode(*table, !(*new&bit));
+					need_tasklet_schedule=1;
+				}
+				table++;
+			}
+		}
+		new++; old++;
+	}
+
+	if(need_tasklet_schedule)
+		tasklet_schedule(&keyboard_tasklet);
+}
+
+
+static void scan_kbd(void *dummy)
+{
+	struct scan_keyboard *kbd;
+
+	for(kbd=keyboards; kbd!=NULL; kbd=kbd->next) {
+		if(jiffies&1) {
+			kbd->scan(kbd->s0);
+			check_kbd(kbd->table, kbd->s0, kbd->s1, kbd->length);
+		}
+		else {
+			kbd->scan(kbd->s1);
+			check_kbd(kbd->table, kbd->s1, kbd->s0, kbd->length);
+		}
+		
+	}
+	queue_task(&task_scan_kbd, &tq_timer);
+}
+
+
+int register_scan_keyboard(void (*scan)(unsigned char *buffer),
+			   const unsigned char *table,
+			   int length)
+{
+	struct scan_keyboard *kbd;
+
+	if((kbd=kmalloc(sizeof(struct scan_keyboard), GFP_KERNEL))==NULL)
+		goto error_out;
+
+	kbd->scan=scan;
+	kbd->table=table;
+	kbd->length=length;
+
+	kbd->s0=kbd->s1=NULL;
+	if((kbd->s0=kmalloc(length, GFP_KERNEL))==NULL)
+		goto error_out;
+	if((kbd->s1=kmalloc(length, GFP_KERNEL))==NULL)
+		goto error_out;
+
+	kbd->scan(kbd->s0);
+	kbd->scan(kbd->s1);
+	
+	kbd->next=keyboards;
+	keyboards=kbd;
+
+	return 0;
+
+ error_mem_free:
+	if(kbd->s0)
+		kfree(kbd->s0);
+	if(kbd->s1)
+		kfree(kbd->s1);
+	kfree(kbd);
+
+ error_out:
+	return -ENOMEM;
+}
+			      
+			      
+void __init scan_kbd_init(void)
+{
+
+	task_scan_kbd.next=NULL;
+	task_scan_kbd.sync=0;
+	task_scan_kbd.routine=scan_kbd;
+	task_scan_kbd.data=NULL;
+	queue_task(&task_scan_kbd, &tq_timer);
+	printk(KERN_INFO "Generic scan keyboard driver initialized\n");
+}
diff -ruN linux-2.4.0-test1.orig/drivers/char/scan_keyb.h linux/drivers/char/scan_keyb.h
--- linux-2.4.0-test1.orig/drivers/char/scan_keyb.h	Thu Jan  1 09:00:00 1970
+++ linux/drivers/char/scan_keyb.h	Tue Jun  6 17:36:10 2000
@@ -0,0 +1,15 @@
+#ifndef	__DRIVER_CHAR_SCAN_KEYB_H
+#define	__DRIVER_CHAR_SCAN_KEYB_H
+/*
+ *	$Id$ 
+ *	Copyright (C) 2000 YAEGASHI Takeshi
+ *	Generic scan keyboard driver
+ */
+
+int register_scan_keyboard(void (*scan)(unsigned char *buffer),
+			   const unsigned char *table,
+			   int length);
+
+void __init scan_kbd_init(void);
+
+#endif
diff -ruN linux-2.4.0-test1.orig/drivers/char/sh-sci.h linux/drivers/char/sh-sci.h
--- linux-2.4.0-test1.orig/drivers/char/sh-sci.h	Tue Jun  6 18:35:53 2000
+++ linux/drivers/char/sh-sci.h	Tue Jun  6 17:42:41 2000
@@ -202,7 +202,11 @@
  */
 #if defined(__sh3__)
 #if defined(CONFIG_CPU_SUBTYPE_SH7709)
+#ifdef CONFIG_SH_HP600
+#define PCLK           22222222
+#else
 #define PCLK           33333333
+#endif
 #else
 #define PCLK           14745600	/* Isn't it 15MHz? */
 #endif
diff -ruN linux-2.4.0-test1.orig/drivers/char/vt.c linux/drivers/char/vt.c
--- linux-2.4.0-test1.orig/drivers/char/vt.c	Wed May  3 08:48:16 2000
+++ linux/drivers/char/vt.c	Tue Jun  6 17:36:10 2000
@@ -62,7 +62,7 @@
  */
 unsigned char keyboard_type = KB_101;
 
-#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__)
+#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__) && !defined(__sh__)
 asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
 #endif
 
@@ -472,7 +472,7 @@
 		ucval = keyboard_type;
 		goto setchar;
 
-#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__)
+#if !defined(__alpha__) && !defined(__mips__) && !defined(__arm__) && !defined(__sh__)
 		/*
 		 * These cannot be implemented on any machine that implements
 		 * ioperm() in user level (such as Alpha PCs).
diff -ruN linux-2.4.0-test1.orig/drivers/video/Config.in linux/drivers/video/Config.in
--- linux-2.4.0-test1.orig/drivers/video/Config.in	Thu May 25 10:38:26 2000
+++ linux/drivers/video/Config.in	Tue Jun  6 17:36:10 2000
@@ -155,6 +155,9 @@
 	 fi
       fi
    fi
+   if [ "$CONFIG_HD64461" = "y" ]; then
+      tristate '  HD64461 Frame Buffer support' CONFIG_FB_HIT
+   fi
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       tristate '  Virtual Frame Buffer support (ONLY FOR TESTING!)' CONFIG_FB_VIRTUAL
    fi
diff -ruN linux-2.4.0-test1.orig/drivers/video/Makefile linux/drivers/video/Makefile
--- linux-2.4.0-test1.orig/drivers/video/Makefile	Thu May 25 10:38:26 2000
+++ linux/drivers/video/Makefile	Tue Jun  6 17:36:10 2000
@@ -115,6 +115,7 @@
 obj-$(CONFIG_FB_HGA)              += hgafb.o  
 obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o  
+obj-$(CONFIG_FB_HIT)              += hitfb.o fbgen.o
 
 # Generic Low Level Drivers
 
diff -ruN linux-2.4.0-test1.orig/drivers/video/fbmem.c linux/drivers/video/fbmem.c
--- linux-2.4.0-test1.orig/drivers/video/fbmem.c	Fri May 26 01:35:27 2000
+++ linux/drivers/video/fbmem.c	Tue Jun  6 17:36:52 2000
@@ -61,6 +61,8 @@
 extern int retz3fb_setup(char*);
 extern int clgenfb_init(void);
 extern int clgenfb_setup(char*);
+extern int hitfb_init(void);
+extern int hitfb_setup(char*);
 extern int vfb_init(void);
 extern int vfb_setup(char*);
 extern int offb_init(void);
@@ -229,6 +231,9 @@
 #ifdef CONFIG_FB_SUN3
        { "sun3", sun3fb_init, sun3fb_setup },
 #endif
+#ifdef CONFIG_FB_HIT
+       { "hitfb", hitfb_init, hitfb_setup },
+#endif
 #ifdef CONFIG_GSP_RESOLVER
 	/* Not a real frame buffer device... */
 	{ "resolver", NULL, resolver_video_setup },
@@ -528,6 +533,8 @@
 	 */
 	pgprot_val(vma->vm_page_prot) &= ~(PTE_CACHEABLE | PTE_BUFFERABLE);
 #endif
+#elif defined(__sh__)
+        pgprot_val(vma->vm_page_prot) &= ~_PAGE_CACHABLE;
 #else
 #warning What do we have to do here??
 #endif
diff -ruN linux-2.4.0-test1.orig/drivers/video/hitfb.c linux/drivers/video/hitfb.c
--- linux-2.4.0-test1.orig/drivers/video/hitfb.c	Thu Jan  1 09:00:00 1970
+++ linux/drivers/video/hitfb.c	Tue Jun  6 17:36:10 2000
@@ -0,0 +1,364 @@
+/*
+ * $Id: hitfb.c,v 1.1 2000/03/24 04:03:06 keshi Exp $
+ * linux/drivers/video/hitfb.c -- Hitachi LCD frame buffer device
+ * (C) 1999 Mihai Spatar
+ * (C) 2000 YAEGASHI Takeshi
+ *
+ *  This file is subject to the terms and conditions of the GNU General Public
+ *  License. See the file COPYING in the main directory of this archive for
+ *  more details.
+ */
+ 
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/tty.h>
+#include <linux/malloc.h>
+#include <linux/delay.h>
+#include <linux/nubus.h>
+#include <linux/init.h>
+
+#include <asm/uaccess.h>
+#include <asm/pgtable.h>
+#include <asm/io.h>
+
+#include <linux/fb.h>
+
+#include <video/fbcon.h>
+#include <video/fbcon-cfb8.h>
+#include <video/fbcon-cfb16.h>
+
+#include <asm/hd64461.h>
+
+#define CONFIG_SH_LCD_VIDEOBASE		(CONFIG_HD64461_IOBASE+0x2000000)
+#define CONFIG_SH_LCD_VIDEOSIZE		1024*1024
+#define CONFIG_SH_LCD_HORZ		640
+#define CONFIG_SH_LCD_VERT		240
+#define CONFIG_SH_LCD_DEFAULTBPP	16
+
+struct hitfb_info {
+  struct fb_info_gen gen;
+};
+
+struct hitfb_par
+{
+  int x, y;
+  int bpp;
+};
+
+static struct hitfb_info fb_info;
+static struct hitfb_par current_par;
+static int current_par_valid = 0;
+static struct display disp;
+
+static union {
+#ifdef FBCON_HAS_CFB16
+    u16 cfb16[16];
+#endif
+} fbcon_cmap;
+
+unsigned long hit_videobase, hit_videosize;
+static struct fb_var_screeninfo default_var;
+
+int hitfb_init(void);
+int hitfb_setup(char*);
+
+static void hitfb_set_par(struct hitfb_par *par, const struct fb_info *info);
+static void hitfb_encode_var(struct fb_var_screeninfo *var, 
+			     struct hitfb_par *par,
+			     const struct fb_info *info);
+
+
+static void hitfb_detect(void)
+{
+    struct hitfb_par par;
+
+    hit_videobase=CONFIG_SH_LCD_VIDEOBASE;
+    hit_videosize=CONFIG_SH_LCD_VIDEOSIZE;
+    par.x=CONFIG_SH_LCD_HORZ;
+    par.y=CONFIG_SH_LCD_VERT;
+    par.bpp=CONFIG_SH_LCD_DEFAULTBPP;
+
+    hitfb_set_par(&par, NULL);
+    hitfb_encode_var(&default_var, &par, NULL);
+}
+
+static int hitfb_encode_fix(struct fb_fix_screeninfo *fix,
+			    struct hitfb_par *par,
+			    const struct fb_info *info)
+{
+  memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+  strcpy(fix->id, "Hitachi HD64461");
+  fix->smem_start=hit_videobase;
+  fix->smem_len=hit_videosize;
+  fix->type = FB_TYPE_PACKED_PIXELS;
+  fix->type_aux = 0;
+  fix->visual = FB_VISUAL_TRUECOLOR;
+  fix->xpanstep=0;
+  fix->ypanstep=0;
+  fix->ywrapstep=0;
+  switch(par->bpp) {
+  default:
+  case 8:
+    fix->line_length=par->x;
+  case 16:
+    fix->line_length=par->x*2;
+  }
+  return 0;
+}
+
+
+static int hitfb_decode_var(struct fb_var_screeninfo *var,
+			    struct hitfb_par *par,
+			    const struct fb_info *info)
+{
+  par->x=var->xres;
+  par->y=var->yres;
+  par->bpp=var->bits_per_pixel;
+  return 0;
+}
+
+
+static void hitfb_encode_var(struct fb_var_screeninfo *var, 
+			     struct hitfb_par *par,
+			     const struct fb_info *info)
+{
+	memset(var, 0, sizeof(*var));
+	var->xres=par->x;
+	var->yres=par->y;
+	var->xres_virtual=var->xres;
+	var->yres_virtual=var->yres;
+	var->xoffset=0;
+	var->yoffset=0;
+	var->bits_per_pixel=par->bpp;
+	var->grayscale=0;
+	var->transp.offset=0;
+	var->transp.length=0;
+	var->transp.msb_right=0;
+	var->nonstd=0;
+	var->activate=0;
+	var->height= -1;
+	var->width= -1;
+	var->vmode=FB_VMODE_NONINTERLACED;
+	var->pixclock=0;
+	var->sync=0;
+	var->left_margin=0;
+	var->right_margin=0;
+	var->upper_margin=0;
+	var->lower_margin=0;
+	var->hsync_len=0;
+	var->vsync_len=0;
+
+    switch (var->bits_per_pixel) {
+	case 8:
+	    var->red.offset = 0;
+	    var->red.length = 8;
+	    var->green.offset = 0;
+	    var->green.length = 8;
+	    var->blue.offset = 0;
+	    var->blue.length = 8;
+	    var->transp.offset = 0;
+	    var->transp.length = 0;
+	    break;
+	case 16:	/* RGB 565 */
+	    var->red.offset = 11;
+	    var->red.length = 5;
+	    var->green.offset = 5;
+	    var->green.length = 6;
+	    var->blue.offset = 0;
+	    var->blue.length = 5;
+	    var->transp.offset = 0;
+	    var->transp.length = 0;
+	    break;
+    }
+    var->red.msb_right = 0;
+    var->green.msb_right = 0;
+    var->blue.msb_right = 0;
+    var->transp.msb_right = 0;
+}
+
+
+static void hitfb_get_par(struct hitfb_par *par, const struct fb_info *info)
+{
+  *par = current_par;
+}
+
+
+static void hitfb_set_par(struct hitfb_par *par, const struct fb_info *info)
+{
+  /*
+   *  Set the hardware according to 'par'.
+   */
+  current_par=*par;
+  current_par_valid=1;
+}
+
+
+static int hitfb_getcolreg(u_int regno, u_int *red, u_int *green, u_int *blue,
+                         u_int *transp, struct fb_info *info)
+{
+	if (regno > 255)
+		return 1;	
+	hd64461_outw(regno<<8, HD64461_CPTRAR);
+	*red = hd64461_inw(HD64461_CPTRDR)<<10;
+	*green = hd64461_inw(HD64461_CPTRDR)<<10;
+	*blue = hd64461_inw(HD64461_CPTRDR)<<10;
+        *transp = 0;
+
+	return 0;
+}
+
+
+static int hitfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
+                         u_int transp, struct fb_info *info)
+{
+	if (regno > 255)
+		return 1;
+
+	hd64461_outw(regno<<8, HD64461_CPTWAR);
+	hd64461_outw(red>>10, HD64461_CPTWDR);
+	hd64461_outw(green>>10, HD64461_CPTWDR);
+	hd64461_outw(blue>>10, HD64461_CPTWDR);
+
+	if(regno<16) {
+	  switch(current_par.bpp) {
+#ifdef FBCON_HAS_CFB16
+	  case 16:
+	    fbcon_cmap.cfb16[regno] =
+	      ((red   & 0xf800)      ) |
+	      ((green & 0xfc00) >>  5) |
+	      ((blue  & 0xf800) >> 11);
+	    break;
+#endif
+	  }
+	}
+	return 0;
+}
+
+static int hitfb_pan_display(struct fb_var_screeninfo *var,
+			     struct hitfb_par *par, const struct fb_info *info)
+{
+  return 0;
+}
+
+
+static int hitfb_blank(int blank_mode, const struct fb_info *info)
+{
+  return 0;
+}
+
+
+static void hitfb_set_disp(const void *par, struct display *disp,
+			   struct fb_info_gen *info)
+{
+  disp->screen_base = (void *)hit_videobase;
+  switch(((struct hitfb_par *)par)->bpp) {
+#ifdef FBCON_HAS_CFB8
+  case 8:
+    disp->dispsw = &fbcon_cfb8;
+    break;
+#endif
+#ifdef FBCON_HAS_CFB16
+  case 16:
+    disp->dispsw = &fbcon_cfb16;
+    disp->dispsw_data = fbcon_cmap.cfb16;
+    break;
+#endif
+  default:
+    disp->dispsw = &fbcon_dummy;
+  }
+}
+
+
+struct fbgen_hwswitch hitfb_switch = {
+    hitfb_detect,
+    hitfb_encode_fix,
+    hitfb_decode_var,
+    hitfb_encode_var,
+    hitfb_get_par,
+    hitfb_set_par,
+    hitfb_getcolreg,
+    hitfb_setcolreg,
+    hitfb_pan_display,
+    hitfb_blank,
+    hitfb_set_disp
+};
+
+
+static int hitfb_open(const struct fb_info *info, int user)
+{
+    MOD_INC_USE_COUNT;
+    return 0;
+}
+
+
+static int hitfb_release(const struct fb_info *info, int user)
+{
+    MOD_DEC_USE_COUNT;
+    return 0;
+}
+
+
+static struct fb_ops hitfb_ops = {
+  hitfb_open, hitfb_release, fbgen_get_fix, fbgen_get_var, fbgen_set_var,
+  fbgen_get_cmap, fbgen_set_cmap, fbgen_pan_display, fbgen_ioctl
+};
+
+
+int __init hitfb_init(void)
+{
+  strcpy(fb_info.gen.info.modename, "Hitachi HD64461");
+  fb_info.gen.info.node = -1;
+  fb_info.gen.info.flags = FBINFO_FLAG_DEFAULT;
+  fb_info.gen.info.fbops = &hitfb_ops;
+  fb_info.gen.info.disp = &disp;
+  fb_info.gen.info.changevar = NULL;
+  fb_info.gen.info.switch_con = &fbgen_switch;
+  fb_info.gen.info.updatevar = &fbgen_update_var;
+  fb_info.gen.info.blank = &fbgen_blank;
+  fb_info.gen.parsize = sizeof(struct hitfb_par);
+  fb_info.gen.fbhw = &hitfb_switch;
+  fb_info.gen.fbhw->detect();
+
+  fbgen_get_var(&disp.var, -1, &fb_info.gen.info);
+  disp.var.activate = FB_ACTIVATE_NOW;
+  fbgen_do_set_var(&disp.var, 1, &fb_info.gen);
+  fbgen_set_disp(-1, &fb_info.gen);
+  fbgen_install_cmap(0, &fb_info.gen);
+  
+  if(register_framebuffer(&fb_info.gen.info)<0) return -EINVAL;
+  
+  printk(KERN_INFO "fb%d: %s frame buffer device\n",
+	 GET_FB_IDX(fb_info.gen.info.node), fb_info.gen.info.modename);
+  
+  return 0;
+}
+
+
+void hitfb_cleanup(struct fb_info *info)
+{
+  unregister_framebuffer(info);
+}
+
+
+int __init hitfb_setup(char *options)
+{
+  /*  */
+  return 0;
+}
+
+
+#ifdef MODULE
+int init_module(void)
+{
+    return hitfb_init();
+}
+
+void cleanup_module(void)
+{
+    hitfb_cleanup(void);
+}
+#endif /* MODULE */
diff -ruN linux-2.4.0-test1.orig/include/asm-sh/hd64461.h linux/include/asm-sh/hd64461.h
--- linux-2.4.0-test1.orig/include/asm-sh/hd64461.h	Thu Jan  1 09:00:00 1970
+++ linux/include/asm-sh/hd64461.h	Tue Jun  6 17:42:55 2000
@@ -0,0 +1,58 @@
+#ifndef __ASM_SH_HD64461
+#define __ASM_SH_HD64461
+/*
+ *	$Id$
+ *	Copyright (C) 2000 YAEGASHI Takeshi
+ *	Hitachi HD64461 companion chip support
+ */
+
+#define HD64461_CPTWAR	0x1030	
+#define HD64461_CPTWDR	0x1032
+#define HD64461_CPTRAR	0x1034	
+#define HD64461_CPTRDR	0x1036
+
+#define HD64461_PCC0ISR         0x2000
+#define HD64461_PCC0GCR         0x2002
+#define HD64461_PCC0CSCR        0x2004
+#define HD64461_PCC0CSCIER      0x2006
+#define HD64461_PCC0SCR         0x2008
+#define HD64461_PCC1ISR         0x2010
+#define HD64461_PCC1GCR         0x2012
+#define HD64461_PCC1CSCR        0x2014
+#define HD64461_PCC1CSCIER      0x2016
+#define HD64461_PCC1SCR         0x2018
+#define HD64461_P0OCR           0x202a
+#define HD64461_P1OCR           0x202c
+#define HD64461_PGCR            0x202e
+
+#define HD64461_NIRR		0x5000
+#define HD64461_NIMR		0x5002
+
+#ifndef CONFIG_HD64461_IOBASE
+#define CONFIG_HD64461_IOBASE	0xb0000000
+#endif
+
+#define HD64461_IRQBASE	64
+
+
+static __inline__ unsigned long hd64461_inb(unsigned int port)
+{
+	return *(volatile unsigned char *)(CONFIG_HD64461_IOBASE+port);
+}
+
+static __inline__ unsigned long hd64461_inw(unsigned int port)
+{
+	return *(volatile unsigned short *)(CONFIG_HD64461_IOBASE+port);
+}
+
+static __inline__ void hd64461_outb(unsigned long b, unsigned int port)
+{
+	*(volatile unsigned char *)(CONFIG_HD64461_IOBASE+port) = b;
+}
+
+static __inline__ void hd64461_outw(unsigned long b, unsigned int port)
+{
+	*(volatile unsigned short *)(CONFIG_HD64461_IOBASE+port) = b;
+}
+
+#endif
diff -ruN linux-2.4.0-test1.orig/include/asm-sh/ide.h linux/include/asm-sh/ide.h
--- linux-2.4.0-test1.orig/include/asm-sh/ide.h	Tue Jun  6 18:35:53 2000
+++ linux/include/asm-sh/ide.h	Tue Jun  6 17:42:57 2000
@@ -25,8 +25,13 @@
 static __inline__ int ide_default_irq(ide_ioreg_t base)
 {
 	switch (base) {
+#ifdef CONFIG_SH_HP600
+		case 0x150001f0: return 77;
+		case 0x15000170: return 77;
+#else
 		case 0x01f0: return 14;
 		case 0x0170: return 15;
+#endif
 		default:
 			return 0;
 	}
@@ -35,10 +40,17 @@
 static __inline__ ide_ioreg_t ide_default_io_base(int index)
 {
 	switch (index) {
+#ifdef CONFIG_SH_HP600
 		case 0:	
-			return 0x01f0;
+			return 0x150001f0;
 		case 1:	
-			return 0x0170;
+			return 0x15000170;
+#else
+		case 0:	
+			return 0x1f0;
+		case 1:	
+			return 0x170;
+#endif
 		default:
 			return 0;
 	}
diff -ruN linux-2.4.0-test1.orig/include/asm-sh/irq.h linux/include/asm-sh/irq.h
--- linux-2.4.0-test1.orig/include/asm-sh/irq.h	Sun May 21 04:05:30 2000
+++ linux/include/asm-sh/irq.h	Tue Jun  6 19:18:02 2000
@@ -43,7 +43,11 @@
 #elif defined(CONFIG_CPU_SUBTYPE_SH7708)
 #define NR_IRQS 32
 #elif defined(CONFIG_CPU_SUBTYPE_SH7709)
+#ifdef CONFIG_HD64461
+#define NR_IRQS 80
+#else
 #define NR_IRQS 61
+#endif
 #endif
 
 extern void disable_irq(unsigned int);
diff -ruN linux-2.4.0-test1.orig/include/asm-sh/keyboard.h linux/include/asm-sh/keyboard.h
--- linux-2.4.0-test1.orig/include/asm-sh/keyboard.h	Thu Jan  1 09:00:00 1970
+++ linux/include/asm-sh/keyboard.h	Tue Jun  6 17:42:29 2000
@@ -0,0 +1,43 @@
+#ifndef	__ASM_SH_KEYBOARD_H
+#define	__ASM_SH_KEYBOARD_H
+/*
+ *	$Id: keyboard.h,v 1.1 2000/03/24 04:03:16 keshi Exp $
+ */
+
+static __inline__ int kbd_setkeycode(unsigned int scancode,
+				     unsigned int keycode)
+{
+    return -EOPNOTSUPP;
+}
+
+static __inline__ int kbd_getkeycode(unsigned int scancode)
+{
+    return scancode > 127 ? -EINVAL : scancode;
+}
+
+static __inline__ int kbd_translate(unsigned char scancode,
+				    unsigned char *keycode, char raw_mode)
+{
+    *keycode = scancode;
+    return 1;
+}
+
+static __inline__ char kbd_unexpected_up(unsigned char keycode)
+{
+    return 0200;
+}
+
+static __inline__ void kbd_leds(unsigned char leds)
+{
+}
+
+#ifdef CONFIG_SH_HP600
+void __init hp600_kbd_init_hw(void);
+#define kbd_init_hw hp600_kbd_init_hw
+#else
+static __inline__ void kbd_init_hw(void)
+{
+}
+#endif
+
+#endif
diff -ruN linux-2.4.0-test1.orig/include/asm-sh/linux_logo.h linux/include/asm-sh/linux_logo.h
--- linux-2.4.0-test1.orig/include/asm-sh/linux_logo.h	Thu Jan  1 09:00:00 1970
+++ linux/include/asm-sh/linux_logo.h	Tue Jun  6 19:19:49 2000
@@ -0,0 +1,48 @@
+/* $Id: linux_logo.h,v 1.1 2000/03/24 04:03:16 keshi Exp $
+ * include/asm-i386/linux_logo.h: This is a linux logo
+ *                                to be displayed on boot.
+ *
+ * Copyright (C) 1996 Larry Ewing (le...@is...)
+ * Copyright (C) 1996 Jakub Jelinek (jj...@su...)
+ *
+ * You can put anything here, but:
+ * LINUX_LOGO_COLORS has to be less than 224
+ * image size has to be 80x80
+ * values have to start from 0x20
+ * (i.e. RGB(linux_logo_red[0],
+ *	     linux_logo_green[0],
+ *	     linux_logo_blue[0]) is color 0x20)
+ * BW image has to be 80x80 as well, with MS bit
+ * on the left
+ * Serial_console ascii image can be any size,
+ * but should contain %s to display the version
+ */
+ 
+#include <linux/init.h>
+#include <linux/version.h>
+
+#define linux_logo_banner "Linux/ia32 version " UTS_RELEASE
+
+#define LINUX_LOGO_COLORS 214
+
+#ifdef INCLUDE_LINUX_LOGO_DATA
+
+#define INCLUDE_LINUX_LOGOBW
+#define INCLUDE_LINUX_LOGO16
+
+#include <linux/linux_logo.h>
+
+#else
+
+/* prototypes only */
+extern unsigned char linux_logo_red[];
+extern unsigned char linux_logo_green[];
+extern unsigned char linux_logo_blue[];
+extern unsigned char linux_logo[];
+extern unsigned char linux_logo_bw[];
+extern unsigned char linux_logo16_red[];
+extern unsigned char linux_logo16_green[];
+extern unsigned char linux_logo16_blue[];
+extern unsigned char linux_logo16[];
+
+#endif
diff -ruN linux-2.4.0-test1.orig/net/ipv4/ipconfig.c linux/net/ipv4/ipconfig.c
--- linux-2.4.0-test1.orig/net/ipv4/ipconfig.c	Wed May  3 17:48:03 2000
+++ linux/net/ipv4/ipconfig.c	Tue Jun  6 19:06:45 2000
@@ -40,7 +40,9 @@
 #include <net/ip.h>
 #include <net/ipconfig.h>
 
+#if defined(__sh__)
 #include <asm/segment.h>
+#endif
 #include <asm/uaccess.h>
 #include <asm/checksum.h>
 

[linuxsh-dev] /bin/mount crashes on 2.4.0-test1...

[NIIBE Y. <gn...@ch...>]

YAEGASHI Takeshi wrote:
 > Yesterday, I had updated my kernel to the latest 2.4.0-test1
 > from CVS, and /bin/mount(in Chiyonofuji-2000-05-16) had gotten
 > not to work.  On 2.3.99-pre9 kernel it worked well and I could
 > mount ext2/vfat partitions of CF.  Have anyone ever had a
 > similar exprerience?

Don't know about that...

 > BTW, I wish to put my HP600 specific codes into CVS.  May I post
 > a patch to SF's Patch Manager or linuxsh-dev list?

I prefer mail.  You could add the patch to the Patch Manager too.
-- 

[linuxsh-dev] /bin/mount crashes on 2.4.0-test1...

[YAEGASHI T. <yae...@ma...>]

Dear developers,

I've made a small ramdisk image (2MB when gzip'ed) from gNiibe's
Chiyonofuji.  I think it can be used as a simple installer, like
a boot floppy of major Linux distribution.  At my site I'll
provide a new kernel binary along with it as the trial kit.

Yesterday, I had updated my kernel to the latest 2.4.0-test1
from CVS, and /bin/mount(in Chiyonofuji-2000-05-16) had gotten
not to work.  On 2.3.99-pre9 kernel it worked well and I could
mount ext2/vfat partitions of CF.  Have anyone ever had a
similar exprerience?

The kernel crashes and mostly resets when attempting to mount
any fs except proc.  It seems to destroy kernel memory
structure somewhere, but I cannot guess where it does...

BTW, I wish to put my HP600 specific codes into CVS.  May I post
a patch to SF's Patch Manager or linuxsh-dev list?

Regards,
--
YAEGASHI Takeshi <yae...@ma...>

[linuxsh-dev] Humorous date

[<mj...@al...>]

Notice something funny with the date?

  http://www.geocrawler.com/archives/3/3076/1000/52/0/3800772/

Mitch :-D
http://www.alphalink.com.au/

[linuxsh-dev] Changes for let GDB work

[NIIBE Y. <gn...@ch...>]

GDB is not yet working.  But here's the changes needed.
I'll commit this on tomorrow or Sunday, if there's no problem.

2000-06-02  NIIBE Yutaka  <gn...@m1...>

	* arch/sh/kernel/entry.S (Throughout): Use ".align 2" instead
	of ".balign 4".
	(debug_kernel): Renamed from "debug".
	(debug_trap): Implemented.
	(system_call): Call debug_trap.

	* arch/sh/kernel/process.c (break_point_trap_software): New
	function.
	(break_point_trap): Define arguments.

	* arch/sh/kernel/entry.S (system_call): Push/Pop registers
	against syscall_trace, those may be clobbered.

Index: arch/sh/kernel/entry.S
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/entry.S,v
retrieving revision 1.10
diff -u -r1.10 entry.S
--- arch/sh/kernel/entry.S	2000/04/30 23:33:47	1.10
+++ arch/sh/kernel/entry.S	2000/06/02 08:13:29
@@ -127,7 +127,7 @@
 	or	$r11, $r10;		\
 	ldc	$r10, $sr
 
-	.balign	4
+	.align	2
 tlb_miss_load:
 	mov.l	2f, $r0
 	mov.l	@$r0, $r6
@@ -137,7 +137,7 @@
 	jmp	@$r0
 	 mov	#0, $r5
 
-	.balign	4
+	.align	2
 tlb_miss_store:
 	mov.l	2f, $r0
 	mov.l	@$r0, $r6
@@ -147,7 +147,7 @@
 	jmp	@$r0
 	 mov	#1, $r5
 
-	.balign	4
+	.align	2
 initial_page_write:
 	mov.l	2f, $r0
 	mov.l	@$r0, $r6
@@ -157,7 +157,7 @@
 	jmp	@$r0
 	 mov	#1, $r5
 
-	.balign	4
+	.align	2
 tlb_protection_violation_load:
 	mov.l	2f, $r0
 	mov.l	@$r0, $r6
@@ -167,7 +167,7 @@
 	jmp	@$r0
 	 mov	#0, $r5
 
-	.balign	4
+	.align	2
 tlb_protection_violation_store:
 	mov.l	2f, $r0
 	mov.l	@$r0, $r6
@@ -177,14 +177,14 @@
 	jmp	@$r0
 	 mov	#1, $r5
 
-	.balign 4
+	.align 2
 1:	.long	SYMBOL_NAME(do_page_fault)
 2:	.long	MMU_TEA
 
 #ifdef CONFIG_DEBUG_KERNEL_WITH_GDB_STUB
-	.balign	4
+	.align	2
 	/* Unwind the stack and jmp to the debug entry */
-debug:
+debug_kernel:
 	mov.l	@$r15+, $r0
 	mov.l	@$r15+, $r1
 	mov.l	@$r15+, $r2
@@ -216,19 +216,36 @@
 	mov.l	2f, $k0
 	jmp	@$k0
 	 ldc	$k1, $ssr
-	.balign	4
+	.align	2
 1:	.long	0x300000f0
 2:	.long	0xa0000100
 #endif
 
-	.balign	4
+	.align	2
+debug_trap:	
+#ifdef CONFIG_DEBUG_KERNEL_WITH_GDB_STUB
+	mov	#SR, $r0
+	mov.l	@($r0,$r15), $r0	! get status register
+	shll	$r0
+	shll	$r0			! kernel space?
+	bt/s	debug_kernel
+#endif
+	 mov.l	@$r15, $r0
+	mov.l	1f, $r8
+	jmp	@$r8
+	 nop
+
+	.align	2
+1:	.long	SYMBOL_NAME(break_point_trap_software)
+
+	.align	2
 error:	
 	!
 	STI()
 	mov.l	1f, $r0
 	jmp	@$r0
 	 nop
-	.balign	4
+	.align	2
 1:	.long	SYMBOL_NAME(do_exception_error)
 
 badsys:	mov	#-ENOSYS, $r0
@@ -263,13 +280,11 @@
 	mov.l	1f, $r9
 	mov.l	@$r9, $r8
 	!
-#ifdef CONFIG_DEBUG_KERNEL_WITH_GDB_STUB
 	mov	#0x20, $r9
 	extu.b	$r9, $r9
 	shll2	$r9
 	cmp/hs	$r9, $r8
-	bt	debug
-#endif
+	bt	debug_trap
 	!
 	mov	#SYSCALL_NR, $r14
 	add	$r15, $r14
@@ -318,9 +333,27 @@
 	!                     Trace system call
 	mov	#-ENOSYS, $r11
 	mov.l	$r11, @(R0,$r15)
+	!			Push up $R0--$R2, and $R4--$R7
+	mov.l	$r0, @-$r15
+	mov.l	$r1, @-$r15
+	mov.l	$r2, @-$r15
+	mov.l	$r4, @-$r15
+	mov.l	$r5, @-$r15
+	mov.l	$r6, @-$r15
+	mov.l	$r7, @-$r15
+	!
 	mov.l	2f, $r11
 	jsr	@$r11
 	 nop
+	!			Pop down $R0--$R2, and $R4--$R7
+	mov.l	@$r15+, $r7
+	mov.l	@$r15+, $r6
+	mov.l	@$r15+, $r5
+	mov.l	@$r15+, $r4
+	mov.l	@$r15+, $r2
+	mov.l	@$r15+, $r1
+	mov.l	@$r15+, $r0
+	!
 	mov.l	__syscall_ret_trace, $r10
 	bra	6f
 	 lds	$r10, $pr
@@ -337,7 +370,7 @@
 	 nop
 
 	! In case of trace
-	.balign	4
+	.align	2
 3:
 #ifdef COMPAT_OLD_SYSCALL_ABI
 	add	$r8, $r15		! pop off the arguments
@@ -347,7 +380,7 @@
 	mova	SYMBOL_NAME(ret_from_syscall), $r0
 	jmp	@$r1
 	 lds	$r0, $pr
-	.balign	4
+	.align	2
 1:	.long	TRA
 2:	.long	SYMBOL_NAME(syscall_trace)
 __n_sys:	.long	NR_syscalls
@@ -366,18 +399,18 @@
 .previous
 
 	.section	__ex_table, "a"
-	.balign	4
+	.align	2
 	.long	4b,fixup_syscall_argerr
 .previous
 #endif
 
-	.balign	4
+	.align	2
 reschedule:
 	mova	SYMBOL_NAME(ret_from_syscall), $r0
 	mov.l	1f, $r1
 	jmp	@$r1
 	 lds	$r0, $pr
-	.balign	4
+	.align	2
 1:	.long	SYMBOL_NAME(schedule)
 
 ENTRY(ret_from_irq)
@@ -401,11 +434,11 @@
 	STI()
 	bra	ret_from_syscall
 	 nop
-	.balign	4
+	.align	2
 __INV_IMASK:
 	.long	0xffffff0f	! ~(IMASK)
 
-	.balign 4
+	.align 2
 syscall_ret:
 #ifdef COMPAT_OLD_SYSCALL_ABI
 	add	$r8, $r15	! pop off the arguments
@@ -438,7 +471,7 @@
 	mova	restore_all, $r0
 	jmp	@$r1
 	 lds	$r0, $pr
-	.balign	4
+	.align	2
 __do_signal:
 	.long	SYMBOL_NAME(do_signal)
 __softirq_state:
@@ -446,7 +479,7 @@
 __do_softirq:
 	.long	SYMBOL_NAME(do_softirq)
 
-	.balign 4
+	.align 2
 restore_all:
 #if defined(__SH4__)
 	mov.l	__fpu_prepare_fd, $r0
@@ -554,7 +587,7 @@
 	rte
 	 nop
 
-	.balign	4
+	.align	2
 __blrb_flags:	.long	0x30000000
 #if defined(__SH4__)
 __fpu_prepare_fd:
@@ -582,7 +615,7 @@
 	mov.l	2f, $k3
 	bra	handle_exception
 	 mov.l	@$k2, $k2
-	.balign	4
+	.align	2
 2:	.long	SYMBOL_NAME(ret_from_exception)
 1:	.long	EXPEVT
 !
@@ -601,7 +634,7 @@
 	bra	handle_exception
 	 mov.l	@$k2, $k2
 
-	.balign	4
+	.align	2
 1:	.long	EXPEVT
 2:	.long	INTEVT
 3:	.long	SYMBOL_NAME(ret_from_irq)
@@ -707,7 +740,7 @@
 	mov.l	@$r9, $r9
 	jmp	@$r9
 	 nop
-	.balign	4
+	.align	2
 1:	.long	SYMBOL_NAME(exception_handling_table)
 2:	.long	0x00008000	! FD=1
 3:	.long	0x000000f0	! FD=0, IMASK=15
Index: arch/sh/kernel/process.c
===================================================================
RCS file: /cvsroot/linuxsh/kernel/arch/sh/kernel/process.c,v
retrieving revision 1.8
diff -u -r1.8 process.c
--- arch/sh/kernel/process.c	2000/04/28 17:58:50	1.8
+++ arch/sh/kernel/process.c	2000/06/02 08:13:29
@@ -384,11 +384,21 @@
 	restore_flags(flags);
 }
 
-asmlinkage void break_point_trap(void)
+asmlinkage void break_point_trap(unsigned long r4, unsigned long r5,
+				 unsigned long r6, unsigned long r7,
+				 struct pt_regs regs)
 {
-	/* Clear traicng.  */
+	/* Clear tracing.  */
 	ctrl_outw(0, UBC_BBRA);
 	ctrl_outw(0, UBC_BBRB);
 
+	force_sig(SIGTRAP, current);
+}
+
+asmlinkage void break_point_trap_software(unsigned long r4, unsigned long r5,
+					  unsigned long r6, unsigned long r7,
+					  struct pt_regs regs)
+{
+	regs.pc -= 2;
 	force_sig(SIGTRAP, current);
 }

Re: [linuxsh-dev] Building instructions

[Mitch D. <mj...@al...>]

Stuart Menefy wrote:
> 
> Building instructions

Top effort Stuart.  We were sorely in need of this and it
couldn't have come at a better time.

> Normally I would have posted this for review, but reviewing HTML is
> probably not very useful, so I've gone ahead and checked it into CVS,
> and uploaded a copy to the web site:

Review is good for file changes, but for new stuff
it's easier for people just to visit the page, as you said.

Good going and thanks.

Regards,

Mitch.
--
| mailto:mj...@al... | Certified Linux Evangelist!
| Note: I am no longer employed by HP.  Update your aliases!

Re: [linuxsh-dev] Can't fix binutils

[<gn...@ya...>]

--- NIIBE Yutaka <gn...@ch...> wrote: > Greg
wrote:
>  >   Do you mean to setup the linuxsh sourceforge
>  > repository as a shadow of the master binutils
>  > repository (wherever that is) ?
> 
> Yes, currently, Kaz&I are busy working towards merge
> into mainline development.  And it is at 
> anoncvs.cygnus.com. 
> Please look at
> http://sourceware.cygnus.com/ for detail.

  Cool, thanks.

  Wow, gdb 5.0 is out.

> I thought that it would be good if people could see
> our "current"  source, as well as supported one.

  Even better, if it works it might reduce or
spread out the merging workload.  Maybe.

> Now, our development with GNU toolchains goes with
> CVS at sourceware,
> which we don't have write permission.

  Yep.

  I don't know if CVSup will solve any of our
problems, but I think it's probably worth trying.
Here are some logistical problems I can foresee:

1. Running the cvsupd daemon at sourceware.
   This should be fairly straighforward...there
   don't seem to be any security implications
   and it's a useful service...but then I haven't
   looked at all the issues properly yet.
   Have you talked to your contact about this?

2. Running the cvsup client on the CVS machine
   at sourceforge.  Currently sf users do not
   have shell access to this machine, so we'd
   need co-operation from the sf admins.  That's
   probably not too hard but I hesitate to ask
   them to bend their own rules before we've
   figured out if CVSup will actually do the job.

  In light of 2 perhaps we'd better set up a
small trial installation of cvsupd/cvsup on
an expendable repository pair and play with it
a while.

Greg.

=====
This address is temporary.

_____________________________________________________________________________
http://movies.yahoo.com.au - Yahoo! Australia & NZ Movies
- Find out what's on at the local cinema with Yahoo! Movies

Re: [linuxsh-dev] Status report on import of Linux 2.4.0-test1

[NIIBE Y. <gn...@ch...>]

NIIBE Yutaka wrote:
 > I'll do that if this has no problem.  I'll post the report, how I do it.
 > If there's problem, please let me know.

I did that.  There's no problem.

I did:
	$ cp -pa kernel kernel.bak
	$ cd kernel
	$ cvs -n up
	[ ... see newer files ]

Remove newly created files in 2.4.0-test0:
	$ rm Documentation/kernel-doc-nano-HOWTO.txt    \
	     Documentation/DocBook/kernel-hacking.tmpl  \
	     Documentation/DocBook/kernel-locking.tmpl  \
	     arch/i386/kernel/cpuid.c                   \
	     arch/i386/kernel/msr.c                     \
	     arch/ppc/mbxboot/gzimage.c 		\
	     arch/ppc/mbxboot/rdimage.c 		\
	     arch/ppc/mbxboot/vmlinux.lds
	$ rm -rf drivers/char/tda7432.c 		\
		 drivers/char/tda9875.c 		\
		 drivers/char/tea6420.c 		\
		 drivers/video/sisfb.c 			\
		 include/asm-arm/arch-l7200		\
		 include/linux/netfilter_ipv6 		\
		 include/linux/sisfb.h			\
		 net/ipv6/netfilter
	$ cvs up -d -P
	$ cvs commit

It include changes for stnic.c and nfs issues too.

OK, now the CVS repository is good state.
-- 

Re: [linuxsh-dev] Can't fix binutils

[NIIBE Y. <gn...@ch...>]

Greg wrote:
 >   I'm not sure what kind of deployment you have in
 > mind.  Do you mean to setup the linuxsh sourceforge
 > repository as a shadow of the master binutils
 > repository (wherever that is) ?

Yes, currently, Kaz&I are busy working towards merge into mainline
development.  And it is at anoncvs.cygnus.com.  Please look at
http://sourceware.cygnus.com/ for detail.

I thought that it would be good if people could see our "current"
source, as well as supported one.

Now, our development with GNU toolchains goes with CVS at sourceware,
which we don't have write permission.
-- 

Re: [linuxsh-dev] Status report on import of Linux 2.4.0-test1

[NIIBE Y. <gn...@ch...>]

NIIBE Yutaka wrote:
 > But CVS would say "Up-to-date check failed", when I have tried to commit.
 > How are things solved in this situation?

OK, I've found simple solution.  Get the source from CVS, and change it
manually with my private sane files, then commit it to CVS.

I'll do that if this has no problem.  I'll post the report, how I do it.
If there's problem, please let me know.
-- 

[linuxsh-dev] Building instructions

[Stuart M. <Stu...@st...>]

Folks

Like many other people, I've had problems putting together a set of tools
and build options which work correctly. Having gone through this again in
the last few days, I've written down what I did, and converted it into
HTML.

Normally I would have posted this for review, but reviewing HTML is
probably not very useful, so I've gone ahead and checked it into CVS,
and uploaded a copy to the web site:
  http://linuxsh.sourceforge.net/docs/building-source.php3

Any comments, please let me know.

Stuart

[linuxsh-dev] glibc grief

[<joh...@pr...>]

ARRRGH!!!

I got Linux kernel with initrd working with hello world (with no glibc support). Now I am trying to build glibc, I got everything from sourceforge (except for glibc, which I got from m17n with the patches)

I think this has something to do with "visibility" --


in function '_dl_map_object_deps'
...undefined reference to __ashldi3
         ...              __sdivsi3

... and so on and so on...

I know if I got this far, it is just a matter of time until I get past this problem.

Thanks

Johnny

----------------------------------------------------------------
Get your free email from AltaVista at http://altavista.iname.com

[linuxsh-dev] I'm a Pocket Penguin!!

[Mitch Davis<mj...@al...>]

Hello friends,

As you all know (from my email address at least),
I have been working for Hewlett Packard.  Today
however is my last day with HP.  (Future mail
should be sent here):

  mj...@al...

For a long time I have been looking for the
elusive goal - how to have a career helping Open
Source software.  It is therefore with a great
deal of pleasure and pride that I make this
announcement.

Some of you might recall that in mid-April there
was mail sent to this list from Craig Snapp, CEO
of Pocket Penguins Inc.

I have had some wonderful conversations with Craig
since then.  Craig and the Pocket Penguin team
really have a vision for Linux, the SuperH chip,
and how PPI can be a part of the Open Source
revolution.

I think his desire to have a company rooted in
Linux, and my desire to cut code and help our
project are very well matched.  So after talking
with him, the decision to join Pocket Penguins was
a natural one for me.  And I'm soooo pumped! :-)

Regarding our project, I will endeavour to help
people as independently as I always have, but now
I will have considerably more time to do it.

PPI believes working with our project should be a
two-way street where all benefit, and I am
convinced that the approach Pocket Penguins has to
Linux, Open Source and us is consistent in every
way with the ideals we hold so dear.

So, I really wanted to share this with all of you.
In short, I'm a Pocket Penguin and I'm thrilled.
It's a whole new opportunity for me, and I hope
for the project as well.

Regards,

Mitch.
http://www.alphalink.com.au/

Re: [linuxsh-dev] Can't fix binutils

[<gn...@ya...>]

--- NIIBE Yutaka <gn...@ch...> wrote: 
> 
> I'm learning about CVS.  People say there's utility
> named CVSup, which
> syncs the repository. 

  I've just been reading about it at
http://www.polstra.com/projects/freeware/CVSup/

  It appears to be a file mirroring tool similar
in concept to rsync but with CVS-aware features,
like the ability to pick apart ,v files to send
only the revisions which are different between
the server and client.

> Good feature is we can setup
> our own branch while
> keep in sync to original repository.

  Conversely, a bad feature is that you *have* to
setup a branch: see FAQ 40 at
http://www.polstra.com/projects/freeware/CVSup/faq.html
What this means is that you still need to do a
potentially-painful merge from the mainline to
the branch periodically.  The only advantage is
that CVSup will have downloaded the mainline
revisions very efficiently before the merge
starts, which is not much of a win given
Mitch's current technique of downloading a .tar.bz2.

Furthermore there doesn't seem to be a way to
check changes into the mainline (see FAQs 38
through 40) except through an extensive semi-manual
diff & patch process with the co-operation of someone
with write access to the original repository.

Better still, you need a specially modified CVS
client (see FAQ 40 again).

> Anyone has experience with CVSup?  If it works as I
> expect, it benefits
> our development of GNU Toolchain.  Thoughts?

  I'm not sure what kind of deployment you have in
mind.  Do you mean to setup the linuxsh sourceforge
repository as a shadow of the master binutils
repository (wherever that is) ?  Or setup a local
personal repository as a shadow of the linuxsh
repository?

Greg.

=====
This address is temporary.

_____________________________________________________________________________
http://movies.yahoo.com.au - Yahoo! Australia & NZ Movies
- Find out what's on at the local cinema with Yahoo! Movies

[linuxsh-dev] Can't fix binutils

[NIIBE Y. <gn...@ch...>]

Mitch Davis wrote:
 > Sorry all, about the binutils delay.

Don't mind.  It's OK for a while, as we have alternative (get tar-ball
and diff).

 > I tried to import binutils-000218 into CVS last night
 > without success.  There are some conflicts there as well.

I'm learning about CVS.  People say there's utility named CVSup, which
syncs the repository.  Good feature is we can setup our own branch while
keep in sync to original repository.

Anyone has experience with CVSup?  If it works as I expect, it benefits
our development of GNU Toolchain.  Thoughts?
-- 

[linuxsh-dev] Can't fix binutils

[Mitch Davis<mj...@al...>]

Hello,

Sorry all, about the binutils delay.

I tried to import binutils-000218 into CVS last night
without success.  There are some conflicts there as well.

I will have another go at it tomorrow when I'm not
forced to use vi over a poor link, and when I've had
the chance to consult with Greg and Niibe.

(I think I've got it right, but I have to be SURE).

Regards,

Mitch.
http://www.alphalink.com.au/

Re: [linuxsh-dev] Patch: Boot time configuration of SCI(F) and Overdrive support

[NIIBE Y. <gn...@ch...>]

Ouch.  I miss you Pierre.  I'm sorry that I couldn't include your
changes yet.  I'm sure that your idea will goes into the kernel
eventually.  I don't know if we can support SH7707 or not, though.

If you have comments about idea below, please let us know.

Upon your suggestion of building all of the things into one image,
I've been thinking like that:

   (1) Keep the kernel as portable if possible
       (not include BSC setting and so)

   (2) Place the hardware specific initialization
       under arch/sh/boot/machine/

   (3) Offer some script generating image (say, S-record or bare binary)
       from vmlinux and the hardware specific initialization

   (4) If needed, develop some tool writing Flash-ROM
       (for specific hardware: CqREEK SH4 or APSH4)
-- 

Re: [linuxsh-dev] Status report on import of Linux 2.4.0-test1

[NIIBE Y. <gn...@ch...>]

Other note.

I have to follow most resent kernel (including testing pre-releases)
to make patches to Linus (or Alan).

But I found that this will be the cause of import conflict, if
we don't have the testing pre-releases in the repository.

It seems for me that two condition are required to avoid conflict.

	(1) Have most resent version in the repository
	    when makeing patches to Linus (or Alan)

	(2) Don't touch files after sending the patch to Linus
	    until he releases new version and we import it

I'm not sure.  Is it the case?  If so, this locking scheme might be
so expensive, IMHO.
-- 

Re: [linuxsh-dev] Status report on import of Linux 2.4.0-test1

[NIIBE Y. <gn...@ch...>]

Mitch Davis wrote:
 > I will see how I can fix the test0 import, and import test1
 > as well, tonight.  (And binutils as well! :-()

There's no test0.  SuperH changes is included in -pre9.

 > The merge mechanism is not perfect, and can't handle overlapping
 > changes very well.  CVS is fine when people fix different things,
 > even in the same file.  But if two people fix the same problem
 > in different ways, it can lead to very nasty conflict problems.

Situation is like this:

Say, Linux released 2.3.99-pre8.  We worked on our part based on
2.3.99-pre8, resulted 2.3.99-pre8+sh1.  I sent the diff
2.3.99-pre8-2.3.99-pre8+sh1 to Linus.  While Linus didn't released
any, our development went further, resulted 2.3.99-pre8+sh2.  Then,
Linus released 2.3.99-pre9 which included +sh1 among other things.

What we need is to make 2.3.99-pre9+sh from 2.3.99-pre9 and 2.3.99-pre8+sh2.

	2.3.99-pre9+sh = 2.3.99-pre9 + 2.3.99-pre8+sh2 - 2.3.99-pre8+sh1

in theory.

Anyway, I have the result in my private tree.

But CVS would say "Up-to-date check failed", when I have tried to commit.
How are things solved in this situation?
-- 

Re: [linuxsh-dev] Status report on import of Linux 2.4.0-test1

[NIIBE Y. <gn...@ch...>]

I have a question about CVS.

Now the files in CVS is somehow corrupts (conflicts or updated wrong
way).  On the other hand, I have sane files in my private tree.

Then, I'd like to commit my sane files to CVS, regardles to current
files on the repository.

How?  Just commit?
-- 

Re: [linuxsh-dev] Status report on import of Linux 2.4.0-test1

[Mitch D. <mj...@al...>]

NIIBE Yutaka wrote:
> 
> Mitch Davis wrote:
>  > This morning I tried to import the official Linux 2.4.0-test1
>  > into our CVS repository.  Unfortunately there are a number
>  > of source conflicts which will need to be solved before the
>  > import is complete.
> 
> I've found ide.h breakage.  The maintainer of IDE code changed
> asm-sh/ide.h.  I have right version on my private tree.

Yes I saw that.  Here is the listing of changed files.
The "C" ones are ones in conflict.

mjd@orbital [~/linux-src/kernel] cvs -q up
M Documentation/Configure.help
R arch/arm/kernel/iic.c
M arch/sh/kernel/entry.S
M arch/sh/kernel/irq.c
M arch/sh/kernel/ptrace.c
M arch/sh/kernel/signal.c
M arch/sh/kernel/time.c
M arch/sh/lib/checksum.S
M arch/sh/mm/cache.c
C arch/sh/mm/fault.c
C drivers/char/generic_serial.c
C drivers/char/sh-sci.c
C drivers/ide/ide.c
M fs/super.c
R fs/umsdos/check.c
R include/asm-arm/proc-armo/semaphore.h
M include/asm-sh/cache.h
M include/asm-sh/ide.h
R include/net/slhc.h
M mm/vmscan.c
M net/core/skbuff.c

> I've sent the diff to Linus, and it is included the 2.4.0-test1.
> The development went further on SuperH part.

I will see how I can fix the test0 import, and import test1
as well, tonight.  (And binutils as well! :-()

> It seems for me that "importing" can't handle such situation.

The merge mechanism is not perfect, and can't handle overlapping
changes very well.  CVS is fine when people fix different things,
even in the same file.  But if two people fix the same problem
in different ways, it can lead to very nasty conflict problems.

Regards,

Mitch.
--
| mailto:mj...@al... | Certified Linux Evangelist!
| Note: I am no longer employed by HP.  Update your aliases!

[linuxsh-dev] Status report on import of Linux 2.4.0-test1

[NIIBE Y. <gn...@ch...>]

Mitch Davis wrote:
 > This morning I tried to import the official Linux 2.4.0-test1
 > into our CVS repository.  Unfortunately there are a number
 > of source conflicts which will need to be solved before the
 > import is complete.

I've found ide.h breakage.  The maintainer of IDE code changed
asm-sh/ide.h.  I have right version on my private tree.

Other than that, I don't see any problem.

I've sent the diff to Linus, and it is included the 2.4.0-test1.
The development went further on SuperH part.

It seems for me that "importing" can't handle such situation.
-- 

[linuxsh-dev] Status report on import of Linux 2.4.0-test1

[Mitch D. <mj...@au...>]

Hello,

This morning I tried to import the official Linux 2.4.0-test1
into our CVS repository.  Unfortunately there are a number
of source conflicts which will need to be solved before the
import is complete.

I will work privately with Niibe-san to resolve these conflicts.

Regards,

Mitch.
--
| mailto:mj...@au...       | Not the official view of: |
| mailto:mj...@al... | Australian Calculator Opn |
| Certified Linux Evangelist! | Hewlett Packard Australia |