From f96441b9faf769c9ecdd4d338b605ea3d0cc4010 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 9 Nov 2004 00:36:47 +0000 Subject: Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches. BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA --- .../linux-libc-headers-2.6.7.0/keyboard.patch | 78 ++++++++++++++++++++++ .../linux-libc-headers-2.6.7.0/sh-missing.patch | 72 ++++++++++++++++++++ .../mips-asm-atomic-system.diff | 11 +++ 3 files changed, 161 insertions(+) (limited to 'linux-libc-headers') diff --git a/linux-libc-headers/linux-libc-headers-2.6.7.0/keyboard.patch b/linux-libc-headers/linux-libc-headers-2.6.7.0/keyboard.patch index e69de29bb2..7df00418b1 100644 --- a/linux-libc-headers/linux-libc-headers-2.6.7.0/keyboard.patch +++ b/linux-libc-headers/linux-libc-headers-2.6.7.0/keyboard.patch @@ -0,0 +1,78 @@ +--- kernel/include/linux/keyboard.h 2004-01-17 23:04:30.000000000 +0000 ++++ kernel/include/linux/keyboard.h 2004-08-30 12:49:41.000000000 +0100 +@@ -37,6 +44,8 @@ + #define KT_ASCII 9 + #define KT_LOCK 10 + #define KT_SLOCK 12 ++#define KT_X 13 /* A few useful symbols from the base X Keysym set, that go with... */ ++#define KT_XF 14 /* The XFree86 Internet multimedia and PDA keyboard symbols */ + + #define K(t,v) (((t)<<8)|(v)) + #define KTYP(x) ((x) >> 8) +@@ -421,4 +430,66 @@ + #define NR_LOCK 8 + + #define MAX_DIACR 256 ++ ++/* ++ * modifications to this section of this list should be coordinated with ++ * the X Window System keysym list; life is much easier that way ++ * ++ */ ++ ++/* These don't correspond identically. */ ++#define K_XMENU K(KT_X, 0x1) ++#define K_XTELEPHONE K(KT_X, 0x2) ++ ++/* ++ * XFree86 vendor specific keysyms. ++ * ++ * These map to XFree86 X keysym range is 0x1008FF01 - 0x1008FFFF; ++ * for simplicity's sake, we'll define a simple identity mapping for these. ++ * ++ * Please coordinate changes here with XFree86.org, so this simple ++ * identity mapping can be maintained (and old code "just works"). ++ * ++ * Keys found on some "Internet" keyboards. ++ */ ++#define K_XFSTANDBY K(KT_XF,0x10) ++#define K_XFAUDIOLOWERVOLUME K(KT_XF,0x11) ++#define K_XFAUDIOMUTE K(KT_XF,0x12) ++#define K_XFAUDIORAISEVOLUME K(KT_XF,0x13) ++#define K_XFAUDIOPLAY K(KT_XF,0x14) ++#define K_XFAUDIOSTOP K(KT_XF,0x15) ++#define K_XFAUDIOPREV K(KT_XF,0x16) ++#define K_XFAUDIONEXT K(KT_XF,0x17) ++#define K_XFHOMEPAGE K(KT_XF,0x18) ++#define K_XFMAIL K(KT_XF,0x19) ++#define K_XFSTART K(KT_XF,0x1A) ++#define K_XFSEARCH K(KT_XF,0x1B) ++#define K_XFAUDIORECORD K(KT_XF,0x1C) ++ ++/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */ ++#define K_XFCALCULATOR K(KT_XF,0x1D) ++#define K_XFMEMO K(KT_XF,0x1E) ++#define K_XFTODOLIST K(KT_XF,0x1F) ++#define K_XFCALENDAR K(KT_XF,0x20) ++#define K_XFPOWERDOWN K(KT_XF,0x21) ++#define K_XFCONTRASTADJUST K(KT_XF,0x22) ++#define K_XFROCKERUP K(KT_XF,0x23) ++#define K_XFROCKERDOWN K(KT_XF,0x24) ++#define K_XFROCKERENTER K(KT_XF,0x25) ++ ++/* Some more "Internet" keyboard symbols */ ++#define K_XFBACK K(KT_XF,0x26) ++#define K_XFFORWARD K(KT_XF,0x27) ++#define K_XFSTOP K(KT_XF,0x28) ++#define K_XFREFRESH K(KT_XF,0x29) ++ ++/* Some more ... */ ++#define K_XFFAVORITES K(KT_XF,0x30) ++#define K_XFAUDIOPAUSE K(KT_XF,0x31) ++#define K_XFAUDIOMEDIA K(KT_XF,0x32) ++#define K_XFMYCOMPUTER K(KT_XF,0x33) ++#define K_XFVENDORHOME K(KT_XF,0x34) ++#define K_XFLIGHTBULB K(KT_XF,0x35) ++#define K_XFSHOP K(KT_XF,0x36) ++ + #endif diff --git a/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch b/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch index e69de29bb2..e97650a9de 100644 --- a/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch +++ b/linux-libc-headers/linux-libc-headers-2.6.7.0/sh-missing.patch @@ -0,0 +1,72 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- /dev/null 2004-06-02 16:28:12.000000000 -0500 ++++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh4/sigcontext.h 2004-08-27 17:56:59.000000000 -0500 +@@ -0,0 +1,24 @@ ++#ifndef __ASM_CPU_SH4_SIGCONTEXT_H ++#define __ASM_CPU_SH4_SIGCONTEXT_H ++ ++struct sigcontext { ++ unsigned long oldmask; ++ ++ /* CPU registers */ ++ unsigned long sc_regs[16]; ++ unsigned long sc_pc; ++ unsigned long sc_pr; ++ unsigned long sc_sr; ++ unsigned long sc_gbr; ++ unsigned long sc_mach; ++ unsigned long sc_macl; ++ ++ /* FPU registers */ ++ unsigned long sc_fpregs[16]; ++ unsigned long sc_xfpregs[16]; ++ unsigned int sc_fpscr; ++ unsigned int sc_fpul; ++ unsigned int sc_ownedfp; ++}; ++ ++#endif /* __ASM_CPU_SH4_SIGCONTEXT_H */ +--- /dev/null 2004-06-02 16:28:12.000000000 -0500 ++++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh2/sigcontext.h 2004-08-27 17:57:54.000000000 -0500 +@@ -0,0 +1,17 @@ ++#ifndef __ASM_CPU_SH2_SIGCONTEXT_H ++#define __ASM_CPU_SH2_SIGCONTEXT_H ++ ++struct sigcontext { ++ unsigned long oldmask; ++ ++ /* CPU registers */ ++ unsigned long sc_regs[16]; ++ unsigned long sc_pc; ++ unsigned long sc_pr; ++ unsigned long sc_sr; ++ unsigned long sc_gbr; ++ unsigned long sc_mach; ++ unsigned long sc_macl; ++}; ++ ++#endif /* __ASM_CPU_SH2_SIGCONTEXT_H */ +--- /dev/null 2004-06-02 16:28:12.000000000 -0500 ++++ linux-libc-headers-2.6.7.0/include/asm-sh/cpu-sh3/sigcontext.h 2004-08-27 17:57:58.000000000 -0500 +@@ -0,0 +1,17 @@ ++#ifndef __ASM_CPU_SH3_SIGCONTEXT_H ++#define __ASM_CPU_SH3_SIGCONTEXT_H ++ ++struct sigcontext { ++ unsigned long oldmask; ++ ++ /* CPU registers */ ++ unsigned long sc_regs[16]; ++ unsigned long sc_pc; ++ unsigned long sc_pr; ++ unsigned long sc_sr; ++ unsigned long sc_gbr; ++ unsigned long sc_mach; ++ unsigned long sc_macl; ++}; ++ ++#endif /* __ASM_CPU_SH3_SIGCONTEXT_H */ diff --git a/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff b/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff index e69de29bb2..a06b5affd9 100644 --- a/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff +++ b/linux-libc-headers/linux-libc-headers-2.6.8.1/mips-asm-atomic-system.diff @@ -0,0 +1,11 @@ +--- include/asm-mips/atomic.h.orig 2004-10-01 10:10:05.487734944 +0200 ++++ include/asm-mips/atomic.h 2004-10-01 10:10:15.837161592 +0200 +@@ -15,8 +15,6 @@ + #define _ASM_ATOMIC_H + + +-#include +- + typedef struct { volatile int counter; } atomic_t; + typedef struct { volatile __s64 counter; } atomic64_t; + -- cgit 1.2.3-korg