Menu
▾
▴
linuxsh-cvs
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(47) |
Sep
(524) |
Oct
(365) |
Nov
(277) |
Dec
(178) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(431) |
Feb
(340) |
Mar
(249) |
Apr
(678) |
May
(407) |
Jun
(449) |
Jul
(712) |
Aug
(391) |
Sep
(205) |
Oct
(692) |
Nov
(45) |
Dec
(61) |
| 2002 |
Jan
(237) |
Feb
(28) |
Mar
(138) |
Apr
(59) |
May
(75) |
Jun
(65) |
Jul
|
Aug
(26) |
Sep
(3) |
Oct
(294) |
Nov
(193) |
Dec
(121) |
| 2003 |
Jan
(160) |
Feb
(2) |
Mar
(277) |
Apr
(71) |
May
(252) |
Jun
(82) |
Jul
(211) |
Aug
(184) |
Sep
(105) |
Oct
(129) |
Nov
(46) |
Dec
(13) |
| 2004 |
Jan
(37) |
Feb
(113) |
Mar
(115) |
Apr
(115) |
May
(45) |
Jun
(141) |
Jul
(13) |
Aug
(82) |
Sep
(12) |
Oct
(69) |
Nov
|
Dec
(37) |
| 2005 |
Jan
(18) |
Feb
(5) |
Mar
(79) |
Apr
(9) |
May
(47) |
Jun
(60) |
Jul
(10) |
Aug
(89) |
Sep
(28) |
Oct
(65) |
Nov
(54) |
Dec
(23) |
| 2006 |
Jan
(198) |
Feb
(51) |
Mar
(23) |
Apr
|
May
|
Jun
(6) |
Jul
(103) |
Aug
(217) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Paul M. <le...@us...> - 2006-07-31 08:27:50
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel/cpu In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30237/arch/sh/kernel/cpu Modified Files: clock.c Log Message: sem2mutex conversion for clock framework. Index: clock.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/cpu/clock.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- clock.c 28 Jan 2006 01:27:00 -0000 1.6 +++ clock.c 31 Jul 2006 08:27:47 -0000 1.7 @@ -1,7 +1,7 @@ /* * arch/sh/kernel/cpu/clock.c - SuperH clock framework * - * Copyright (C) 2005 Paul Mundt + * Copyright (C) 2005, 2006 Paul Mundt * * This clock framework is derived from the OMAP version by: * @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/module.h> +#include <linux/mutex.h> #include <linux/list.h> #include <linux/kref.h> #include <linux/seq_file.h> @@ -24,7 +25,7 @@ static LIST_HEAD(clock_list); static DEFINE_SPINLOCK(clock_lock); -static DECLARE_MUTEX(clock_list_sem); +static DEFINE_MUTEX(clock_list_sem); /* * Each subtype is expected to define the init routines for these clocks, @@ -140,21 +141,21 @@ int clk_register(struct clk *clk) { - down(&clock_list_sem); + mutex_lock(&clock_list_sem); list_add(&clk->node, &clock_list); kref_init(&clk->kref); - up(&clock_list_sem); + mutex_unlock(&clock_list_sem); return 0; } void clk_unregister(struct clk *clk) { - down(&clock_list_sem); + mutex_lock(&clock_list_sem); list_del(&clk->node); - up(&clock_list_sem); + mutex_unlock(&clock_list_sem); } inline unsigned long clk_get_rate(struct clk *clk) @@ -198,14 +199,14 @@ { struct clk *p, *clk = ERR_PTR(-ENOENT); - down(&clock_list_sem); + mutex_lock(&clock_list_sem); list_for_each_entry(p, &clock_list, node) { if (strcmp(id, p->name) == 0 && try_module_get(p->owner)) { clk = p; break; } } - up(&clock_list_sem); + mutex_unlock(&clock_list_sem); return clk; } |
|
From: Paul M. <le...@us...> - 2006-07-31 01:27:03
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19421/include/asm-sh Modified Files: uaccess.h Log Message: __addr_ok() fixes for nommu from Sato-san. Index: uaccess.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/uaccess.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- uaccess.h 19 Jul 2006 15:16:35 -0000 1.18 +++ uaccess.h 31 Jul 2006 01:27:00 -0000 1.19 @@ -33,12 +33,12 @@ #define segment_eq(a,b) ((a).seg == (b).seg) -#define __addr_ok(addr) \ - ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg)) - #define get_ds() (KERNEL_DS) #if !defined(CONFIG_MMU) +/* NOMMU is always true */ +#define __addr_ok(addr) (1) + static inline mm_segment_t get_fs(void) { return USER_DS; @@ -65,6 +65,9 @@ return ((addr >= memory_start) && ((addr + size) < memory_end)); } #else /* CONFIG_MMU */ +#define __addr_ok(addr) \ + ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg)) + #define get_fs() (current_thread_info()->addr_limit) #define set_fs(x) (current_thread_info()->addr_limit = (x)) |
|
From: Paul M. <le...@us...> - 2006-07-31 01:21:13
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14764/arch/sh/kernel Modified Files: syscalls.S entry.S signal.c Log Message: Support pselect6 and ppoll, along with signal trampoline rework. Index: syscalls.S =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/syscalls.S,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- syscalls.S 19 Jul 2006 19:10:31 -0000 1.5 +++ syscalls.S 31 Jul 2006 01:21:08 -0000 1.6 @@ -321,34 +321,35 @@ .long sys_mq_getsetattr .long sys_kexec_load .long sys_waitid - .long sys_add_key /* 285 */ + .long sys_ni_syscall /* 285 */ + .long sys_add_key .long sys_request_key .long sys_keyctl .long sys_ioprio_set - .long sys_ioprio_get - .long sys_inotify_init /* 290 */ + .long sys_ioprio_get /* 290 */ + .long sys_inotify_init .long sys_inotify_add_watch .long sys_inotify_rm_watch .long sys_migrate_pages - .long sys_openat - .long sys_mkdirat /* 295 */ + .long sys_openat /* 295 */ + .long sys_mkdirat .long sys_mknodat .long sys_fchownat .long sys_futimesat - .long sys_fstatat64 - .long sys_unlinkat /* 300 */ + .long sys_fstatat64 /* 300 */ + .long sys_unlinkat .long sys_renameat .long sys_linkat .long sys_symlinkat - .long sys_readlinkat - .long sys_fchmodat /* 305 */ + .long sys_readlinkat /* 305 */ + .long sys_fchmodat .long sys_faccessat - .long sys_ni_syscall /* Reserved for pselect6 */ - .long sys_ni_syscall /* Reserved for ppoll */ - .long sys_unshare - .long sys_set_robust_list /* 310 */ + .long sys_pselect6 + .long sys_ppoll + .long sys_unshare /* 310 */ + .long sys_set_robust_list .long sys_get_robust_list .long sys_splice .long sys_sync_file_range - .long sys_tee - .long sys_vmsplice /* 315 */ + .long sys_tee /* 315 */ + .long sys_vmsplice Index: entry.S =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/entry.S,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- entry.S 19 Jul 2006 19:10:31 -0000 1.47 +++ entry.S 31 Jul 2006 01:21:08 -0000 1.48 @@ -372,12 +372,12 @@ ! r8: current_thread_info ! t: result of "tst #_TIF_NEED_RESCHED, r0" bf/s work_resched - tst #_TIF_SIGPENDING, r0 + tst #(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK), r0 work_notifysig: bt/s restore_all mov r15, r4 - mov #0, r5 - mov r12, r6 ! set arg2(save_r0) + mov r12, r5 ! set arg1(save_r0) + mov r0, r6 mov.l 2f, r1 mova restore_all, r0 jmp @r1 @@ -415,7 +415,7 @@ .align 2 1: .long schedule -2: .long do_signal +2: .long do_notify_resume .align 2 syscall_exit_work: Index: signal.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/signal.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- signal.c 19 Jul 2006 19:10:31 -0000 1.31 +++ signal.c 31 Jul 2006 01:21:08 -0000 1.32 @@ -29,13 +29,10 @@ #include <asm/pgtable.h> #include <asm/cacheflush.h> -#define DEBUG_SIG 0 +#undef DEBUG #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) -asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset, - unsigned int save_r0); - /* * Atomically swap in the new signal mask, and wait for a signal. */ @@ -44,51 +41,17 @@ unsigned long r5, unsigned long r6, unsigned long r7, struct pt_regs regs) { - sigset_t saveset; - mask &= _BLOCKABLE; spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; + current->saved_sigmask = current->blocked; siginitset(¤t->blocked, mask); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); - regs.regs[0] = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(®s, &saveset, regs.regs[0])) - return -EINTR; - } -} - -asmlinkage int -sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize, - unsigned long r6, unsigned long r7, - struct pt_regs regs) -{ - sigset_t saveset, newset; - - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, unewset, sizeof(newset))) - return -EFAULT; - sigdelsetmask(&newset, ~_BLOCKABLE); - spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; - current->blocked = newset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - - regs.regs[0] = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(®s, &saveset, regs.regs[0])) - return -EINTR; - } + current->state = TASK_INTERRUPTIBLE; + schedule(); + set_thread_flag(TIF_RESTORE_SIGMASK); + return -ERESTARTNOHAND; } asmlinkage int @@ -349,7 +312,7 @@ return (void __user *)((sp - frame_size) & -8ul); } -static void setup_frame(int sig, struct k_sigaction *ka, +static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set, struct pt_regs *regs) { struct sigframe __user *frame; @@ -369,10 +332,9 @@ err |= setup_sigcontext(&frame->sc, regs, set->sig[0]); - if (_NSIG_WORDS > 1) { + if (_NSIG_WORDS > 1) err |= __copy_to_user(frame->extramask, &set->sig[1], sizeof(frame->extramask)); - } /* Set up to return from userspace. If provided, use a stub already in userspace. */ @@ -403,21 +365,22 @@ set_fs(USER_DS); -#if DEBUG_SIG - printk("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n", - current->comm, current->pid, frame, regs->pc, regs->pr); -#endif + pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n", + current->comm, current->pid, frame, regs->pc, regs->pr); flush_cache_sigtramp(regs->pr); + if ((-regs->pr & (L1_CACHE_BYTES-1)) < sizeof(frame->retcode)) flush_cache_sigtramp(regs->pr + L1_CACHE_BYTES); - return; + + return 0; give_sigsegv: force_sigsegv(sig, current); + return -EFAULT; } -static void setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, +static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *set, struct pt_regs *regs) { struct rt_sigframe __user *frame; @@ -478,28 +441,31 @@ set_fs(USER_DS); -#if DEBUG_SIG - printk("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n", - current->comm, current->pid, frame, regs->pc, regs->pr); -#endif + pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n", + current->comm, current->pid, frame, regs->pc, regs->pr); flush_cache_sigtramp(regs->pr); + if ((-regs->pr & (L1_CACHE_BYTES-1)) < sizeof(frame->retcode)) flush_cache_sigtramp(regs->pr + L1_CACHE_BYTES); - return; + + return 0; give_sigsegv: force_sigsegv(sig, current); + return -EFAULT; } /* * OK, we're invoking a handler */ -static void +static int handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset, struct pt_regs *regs) { + int ret; + /* Are we from a system call? */ if (regs->tra >= 0) { /* If so, check system call restarting.. */ @@ -540,19 +506,23 @@ /* Set up the stack frame */ if (ka->sa.sa_flags & SA_SIGINFO) - setup_rt_frame(sig, ka, info, oldset, regs); + ret = setup_rt_frame(sig, ka, info, oldset, regs); else - setup_frame(sig, ka, oldset, regs); + ret = setup_frame(sig, ka, oldset, regs); if (ka->sa.sa_flags & SA_ONESHOT) ka->sa.sa_handler = SIG_DFL; - spin_lock_irq(¤t->sighand->siglock); - sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); - if (!(ka->sa.sa_flags & SA_NODEFER)) - sigaddset(¤t->blocked,sig); - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); + if (ret == 0) { + spin_lock_irq(¤t->sighand->siglock); + sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); + if (!(ka->sa.sa_flags & SA_NODEFER)) + sigaddset(¤t->blocked,sig); + recalc_sigpending(); + spin_unlock_irq(¤t->sighand->siglock); + } + + return ret; } /* @@ -564,11 +534,12 @@ * the kernel can handle, and then we build all the user-level signal handling * stack-frames in one go after that. */ -int do_signal(struct pt_regs *regs, sigset_t *oldset, unsigned int save_r0) +static void do_signal(struct pt_regs *regs, unsigned int save_r0) { siginfo_t info; int signr; struct k_sigaction ka; + sigset_t *oldset; /* * We want the common case to go fast, which @@ -577,19 +548,27 @@ * if so. */ if (!user_mode(regs)) - return 1; + return; if (try_to_freeze()) goto no_signal; - if (!oldset) + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + oldset = ¤t->saved_sigmask; + else oldset = ¤t->blocked; signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (signr > 0) { /* Whee! Actually deliver the signal. */ - handle_signal(signr, &ka, &info, oldset, regs); - return 1; + if (handle_signal(signr, &ka, &info, oldset, regs) == 0) { + /* a signal was successfully delivered; the saved + * sigmask will have been stored in the signal frame, + * and will be restored by sigreturn, so we can simply + * clear the TIF_RESTORE_SIGMASK flag */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + clear_thread_flag(TIF_RESTORE_SIGMASK); + } } no_signal: @@ -606,5 +585,19 @@ regs->regs[3] = __NR_restart_syscall; } } - return 0; + + /* if there's no signal to deliver, we just put the saved sigmask + * back */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) { + clear_thread_flag(TIF_RESTORE_SIGMASK); + sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); + } +} + +asmlinkage void do_notify_resume(struct pt_regs *regs, unsigned int save_r0, + __u32 thread_info_flags) +{ + /* deal with pending signal delivery */ + if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) + do_signal(regs, save_r0); } |
|
From: Paul M. <le...@us...> - 2006-07-31 01:21:13
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv14764/include/asm-sh Modified Files: thread_info.h unistd.h Log Message: Support pselect6 and ppoll, along with signal trampoline rework. Index: thread_info.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/thread_info.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- thread_info.h 7 Jul 2006 03:42:09 -0000 1.18 +++ thread_info.h 31 Jul 2006 01:21:09 -0000 1.19 @@ -94,6 +94,7 @@ #define TIF_NOTIFY_RESUME 1 /* resumption notification requested */ #define TIF_SIGPENDING 2 /* signal pending */ #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ +#define TIF_RESTORE_SIGMASK 4 /* restore signal mask in do_signal() */ #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_MEMDIE 18 @@ -102,6 +103,7 @@ #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) #define _TIF_SIGPENDING (1<<TIF_SIGPENDING) #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) +#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK) #define _TIF_USEDFPU (1<<TIF_USEDFPU) #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) Index: unistd.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/unistd.h,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- unistd.h 7 Jul 2006 06:15:53 -0000 1.29 +++ unistd.h 31 Jul 2006 01:21:09 -0000 1.30 @@ -292,39 +292,40 @@ #define __NR_mq_getsetattr (__NR_mq_open+5) #define __NR_kexec_load 283 #define __NR_waitid 284 -#define __NR_add_key 285 -#define __NR_request_key 286 -#define __NR_keyctl 287 -#define __NR_ioprio_set 288 -#define __NR_ioprio_get 289 -#define __NR_inotify_init 290 -#define __NR_inotify_add_watch 291 -#define __NR_inotify_rm_watch 292 -#define __NR_migrate_pages 293 -#define __NR_openat 294 -#define __NR_mkdirat 295 -#define __NR_mknodat 296 -#define __NR_fchownat 297 -#define __NR_futimesat 298 -#define __NR_fstatat64 299 -#define __NR_unlinkat 300 -#define __NR_renameat 301 -#define __NR_linkat 302 -#define __NR_symlinkat 303 -#define __NR_readlinkat 304 -#define __NR_fchmodat 305 -#define __NR_faccessat 305 -#define __NR_pselect6 307 -#define __NR_ppoll 308 -#define __NR_unshare 309 -#define __NR_set_robust_list 310 -#define __NR_get_robust_list 311 -#define __NR_splice 312 -#define __NR_sync_file_range 313 -#define __NR_tee 314 -#define __NR_vmsplice 315 +/* #define __NR_sys_setaltroot 285 */ +#define __NR_add_key 286 +#define __NR_request_key 287 +#define __NR_keyctl 288 +#define __NR_ioprio_set 289 +#define __NR_ioprio_get 290 +#define __NR_inotify_init 291 +#define __NR_inotify_add_watch 292 +#define __NR_inotify_rm_watch 293 +#define __NR_migrate_pages 294 +#define __NR_openat 295 +#define __NR_mkdirat 296 +#define __NR_mknodat 297 +#define __NR_fchownat 298 +#define __NR_futimesat 299 +#define __NR_newfstatat 300 +#define __NR_unlinkat 301 +#define __NR_renameat 302 +#define __NR_linkat 303 +#define __NR_symlinkat 304 +#define __NR_readlinkat 305 +#define __NR_fchmodat 306 +#define __NR_faccessat 307 +#define __NR_pselect6 308 +#define __NR_ppoll 309 +#define __NR_unshare 310 +#define __NR_set_robust_list 311 +#define __NR_get_robust_list 312 +#define __NR_splice 313 +#define __NR_sync_file_range 314 +#define __NR_tee 315 +#define __NR_vmsplice 316 -#define NR_syscalls 316 +#define NR_syscalls 317 /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */ @@ -465,6 +466,7 @@ #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION +#define __ARCH_WANT_SYS_RT_SIGSUSPEND #endif #ifdef __KERNEL_SYSCALLS__ |
|
From: Paul M. <le...@us...> - 2006-07-24 22:42:50
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22552/include/asm-sh Modified Files: io.h addrspace.h Log Message: More nommu fixups from Sato-san. Index: io.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/io.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- io.h 5 Jul 2006 08:46:49 -0000 1.20 +++ io.h 24 Jul 2006 22:42:46 -0000 1.21 @@ -217,6 +217,7 @@ #define IO_SPACE_LIMIT 0xffffffff +#ifdef CONFIG_MMU /* * Change virtual addresses to physical addresses and vv. * These are trivial on the 1:1 Linux/SuperH mapping @@ -230,6 +231,10 @@ { return (void *)P1SEGADDR(address); } +#else +#define phys_to_virt(address) ((void *)(address)) +#define virt_to_phys(address) ((unsigned long)(address)) +#endif #define virt_to_bus virt_to_phys #define bus_to_virt phys_to_virt Index: addrspace.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/addrspace.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- addrspace.h 19 Jul 2006 14:46:07 -0000 1.5 +++ addrspace.h 24 Jul 2006 22:42:46 -0000 1.6 @@ -14,7 +14,7 @@ #include <asm/cpu/addrspace.h> /* Memory segments (32bit Privileged mode addresses) */ -#ifdef CONFIG_MMU +#ifndef CONFIG_CPU_SH2A #define P0SEG 0x00000000 #define P1SEG 0x80000000 #define P2SEG 0xa0000000 @@ -24,7 +24,7 @@ #define P0SEG 0x00000000 #define P1SEG 0x00000000 #define P2SEG 0x20000000 -#define P3SEG 0x40000000 +#define P3SEG 0x00000000 #define P4SEG 0x80000000 #endif |
|
From: Paul M. <le...@us...> - 2006-07-24 22:42:50
|
Update of /cvsroot/linuxsh/linux/arch/sh/boot/compressed In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22552/arch/sh/boot/compressed Modified Files: Makefile Log Message: More nommu fixups from Sato-san. Index: Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boot/compressed/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- Makefile 19 Jul 2006 14:41:11 -0000 1.15 +++ Makefile 24 Jul 2006 22:42:46 -0000 1.16 @@ -22,9 +22,9 @@ CONFIG_MEMORY_START ?= 0x0c000000 CONFIG_BOOT_LINK_OFFSET ?= 0x00800000 -IMAGE_OFFSET := $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET) + \ - $(CONFIG_MEMORY_START) + \ - $(CONFIG_BOOT_LINK_OFFSET)]) +IMAGE_OFFSET := $(shell printf "0x%08x" $$[$(CONFIG_PAGE_OFFSET) + \ + $(CONFIG_MEMORY_START) + \ + $(CONFIG_BOOT_LINK_OFFSET)]) LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) |
|
From: Paul M. <le...@us...> - 2006-07-19 19:10:38
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28636/arch/sh/kernel Modified Files: entry.S signal.c syscalls.S Log Message: __NR_restart_syscall support. Index: entry.S =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/entry.S,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- entry.S 29 Jan 2006 17:46:23 -0000 1.46 +++ entry.S 19 Jul 2006 19:10:31 -0000 1.47 @@ -377,6 +377,7 @@ bt/s restore_all mov r15, r4 mov #0, r5 + mov r12, r6 ! set arg2(save_r0) mov.l 2f, r1 mova restore_all, r0 jmp @r1 @@ -535,6 +536,7 @@ mov.l @r9, r8 jsr @r8 ! jump to specific syscall handler nop + mov.l @(OFF_R0,r15), r12 ! save r0 mov.l r0, @(OFF_R0,r15) ! save the return value ! syscall_exit: Index: signal.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/signal.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- signal.c 28 Oct 2005 13:12:48 -0000 1.30 +++ signal.c 19 Jul 2006 19:10:31 -0000 1.31 @@ -33,7 +33,8 @@ #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) -asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset); +asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset, + unsigned int save_r0); /* * Atomically swap in the new signal mask, and wait for a signal. @@ -56,7 +57,7 @@ while (1) { current->state = TASK_INTERRUPTIBLE; schedule(); - if (do_signal(®s, &saveset)) + if (do_signal(®s, &saveset, regs.regs[0])) return -EINTR; } } @@ -85,7 +86,7 @@ while (1) { current->state = TASK_INTERRUPTIBLE; schedule(); - if (do_signal(®s, &saveset)) + if (do_signal(®s, &saveset, regs.regs[0])) return -EINTR; } } @@ -563,7 +564,7 @@ * the kernel can handle, and then we build all the user-level signal handling * stack-frames in one go after that. */ -int do_signal(struct pt_regs *regs, sigset_t *oldset) +int do_signal(struct pt_regs *regs, sigset_t *oldset, unsigned int save_r0) { siginfo_t info; int signr; @@ -597,9 +598,12 @@ /* Restart the system call - no handlers present */ if (regs->regs[0] == -ERESTARTNOHAND || regs->regs[0] == -ERESTARTSYS || - regs->regs[0] == -ERESTARTNOINTR || - regs->regs[0] == -ERESTART_RESTARTBLOCK) { + regs->regs[0] == -ERESTARTNOINTR) { + regs->regs[0] = save_r0; + regs->pc -= 2; + } else if (regs->regs[0] == -ERESTART_RESTARTBLOCK) { regs->pc -= 2; + regs->regs[3] = __NR_restart_syscall; } } return 0; Index: syscalls.S =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/syscalls.S,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- syscalls.S 7 Jul 2006 06:15:53 -0000 1.4 +++ syscalls.S 19 Jul 2006 19:10:31 -0000 1.5 @@ -36,7 +36,7 @@ .data ENTRY(sys_call_table) - .long sys_ni_syscall /* 0 - old "setup()" system call*/ + .long sys_restart_syscall /* 0 - old "setup()" system call*/ .long sys_exit .long sys_fork .long sys_read |
|
From: Paul M. <le...@us...> - 2006-07-19 15:45:47
|
Update of /cvsroot/linuxsh/linux/arch/sh/mm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8921/arch/sh/mm Modified Files: init.c pg-nommu.c Log Message: Fixup nommu page ops. Index: init.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/init.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- init.c 5 Jul 2006 08:46:48 -0000 1.28 +++ init.c 19 Jul 2006 15:45:38 -0000 1.29 @@ -249,8 +249,13 @@ * Setup wrappers for copy/clear_page(), these will get overridden * later in the boot process if a better method is available. */ +#ifdef CONFIG_MMU copy_page = copy_page_slow; clear_page = clear_page_slow; +#else + copy_page = copy_page_nommu; + clear_page = clear_page_nommu; +#endif /* this will put all low memory onto the freelists */ totalram_pages += free_all_bootmem_node(NODE_DATA(0)); Index: pg-nommu.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/pg-nommu.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pg-nommu.c 25 Oct 2003 21:45:29 -0000 1.1 +++ pg-nommu.c 19 Jul 2006 15:45:38 -0000 1.2 @@ -14,23 +14,24 @@ #include <linux/string.h> #include <asm/page.h> -static void copy_page_nommu(void *to, void *from) +void copy_page_nommu(void *to, void *from) { memcpy(to, from, PAGE_SIZE); } -static void clear_page_nommu(void *to) +void clear_page_nommu(void *to) { memset(to, 0, PAGE_SIZE); } -static int __init pg_nommu_init(void) +__kernel_size_t __copy_user(void *to, const void *from, __kernel_size_t n) { - copy_page = copy_page_nommu; - clear_page = clear_page_nommu; - + memcpy(to, from, n); return 0; } -subsys_initcall(pg_nommu_init); - +__kernel_size_t __clear_user(void *to, __kernel_size_t n) +{ + memset(to, 0, n); + return 0; +} |
|
From: Paul M. <le...@us...> - 2006-07-19 15:45:42
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8921/include/asm-sh Modified Files: page.h Log Message: Fixup nommu page ops. Index: page.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/page.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- page.h 19 Jul 2006 14:33:16 -0000 1.16 +++ page.h 19 Jul 2006 15:45:38 -0000 1.17 @@ -39,8 +39,13 @@ extern void (*clear_page)(void *to); extern void (*copy_page)(void *to, void *from); +#ifdef CONFIG_MMU extern void clear_page_slow(void *to); extern void copy_page_slow(void *to, void *from); +#else +extern void clear_page_nommu(void *to); +extern void copy_page_nommu(void *to, void *from); +#endif #if defined(CONFIG_MMU) && (defined(CONFIG_CPU_SH4) || \ defined(CONFIG_SH7705_CACHE_32KB)) |
|
From: Paul M. <le...@us...> - 2006-07-19 15:16:39
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30129/include/asm-sh Modified Files: uaccess.h Log Message: __get_user_check() for nommu, from Sato-san. Index: uaccess.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/uaccess.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- uaccess.h 7 Jul 2006 04:02:06 -0000 1.17 +++ uaccess.h 19 Jul 2006 15:16:35 -0000 1.18 @@ -167,6 +167,7 @@ __gu_err; \ }) +#ifdef CONFIG_MMU #define __get_user_check(x,ptr,size) \ ({ \ long __gu_err, __gu_val; \ @@ -256,6 +257,18 @@ : "r" (addr) \ : "t"); \ }) +#else /* CONFIG_MMU */ +#define __get_user_check(x,ptr,size) \ +({ \ + long __gu_err, __gu_val; \ + if (__access_ok((unsigned long)(ptr), (size))) { \ + __get_user_size(__gu_val, (ptr), (size), __gu_err); \ + (x) = (__typeof__(*(ptr)))__gu_val; \ + } else \ + __gu_err = -EFAULT; \ + __gu_err; \ +}) +#endif #define __get_user_asm(x, addr, err, insn) \ ({ \ |
|
From: Paul M. <le...@us...> - 2006-07-19 14:50:24
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19907/include/asm-sh Modified Files: flat.h mmu.h Log Message: nommu fixes from Sato-san. Index: flat.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/flat.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- flat.h 16 Jun 2004 15:21:48 -0000 1.2 +++ flat.h 19 Jul 2006 14:50:21 -0000 1.3 @@ -13,7 +13,7 @@ #define __ASM_SH_FLAT_H #define flat_stack_align(sp) /* nothing needed */ -#define flat_argvp_envp_on_stack() 1 +#define flat_argvp_envp_on_stack() 0 #define flat_old_ram_flag(flags) (flags) #define flat_reloc_valid(reloc, size) ((reloc) <= (size)) #define flat_get_addr_from_rp(rp, relval, flags) get_unaligned(rp) Index: mmu.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/mmu.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- mmu.h 3 Jan 2006 22:51:48 -0000 1.4 +++ mmu.h 19 Jul 2006 14:50:21 -0000 1.5 @@ -3,19 +3,8 @@ #if !defined(CONFIG_MMU) -struct mm_rblock_struct { - int size; - int refcount; - void *kblock; -}; - -struct mm_tblock_struct { - struct mm_rblock_struct *rblock; - struct mm_tblock_struct *next; -}; - typedef struct { - struct mm_tblock_struct tblock; + struct vm_list_struct *vmlist; unsigned long end_brk; } mm_context_t; |
|
From: Paul M. <le...@us...> - 2006-07-19 14:46:10
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18304/include/asm-sh Modified Files: addrspace.h Log Message: Fixup addrspace segmentation for nommu. Index: addrspace.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/addrspace.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- addrspace.h 5 Jul 2006 08:46:49 -0000 1.4 +++ addrspace.h 19 Jul 2006 14:46:07 -0000 1.5 @@ -14,11 +14,19 @@ #include <asm/cpu/addrspace.h> /* Memory segments (32bit Privileged mode addresses) */ +#ifdef CONFIG_MMU #define P0SEG 0x00000000 #define P1SEG 0x80000000 #define P2SEG 0xa0000000 #define P3SEG 0xc0000000 #define P4SEG 0xe0000000 +#else +#define P0SEG 0x00000000 +#define P1SEG 0x00000000 +#define P2SEG 0x20000000 +#define P3SEG 0x40000000 +#define P4SEG 0x80000000 +#endif /* Returns the privileged segment base of a given address */ #define PXSEG(a) (((unsigned long)(a)) & 0xe0000000) |
|
From: Paul M. <le...@us...> - 2006-07-19 14:41:15
|
Update of /cvsroot/linuxsh/linux/arch/sh/boot/compressed In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16391/arch/sh/boot/compressed Modified Files: Makefile Log Message: Link in libgcc explicitly for the compressed case. Index: Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boot/compressed/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- Makefile 19 Jul 2006 14:33:16 -0000 1.14 +++ Makefile 19 Jul 2006 14:41:11 -0000 1.15 @@ -21,11 +21,17 @@ CONFIG_PAGE_OFFSET ?= 0x80000000 CONFIG_MEMORY_START ?= 0x0c000000 CONFIG_BOOT_LINK_OFFSET ?= 0x00800000 -IMAGE_OFFSET := $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET)+$(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET)]) + +IMAGE_OFFSET := $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET) + \ + $(CONFIG_MEMORY_START) + \ + $(CONFIG_BOOT_LINK_OFFSET)]) + +LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds -$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o FORCE + +$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE $(call if_changed,ld) @: |
|
From: Paul M. <le...@us...> - 2006-07-19 14:33:28
|
Update of /cvsroot/linuxsh/linux/arch/sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12846/arch/sh Modified Files: Kconfig Log Message: Make PAGE_OFFSET configurable via CONFIG_PAGE_OFFSET, needed for nommu. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/Kconfig,v retrieving revision 1.100 retrieving revision 1.101 diff -u -d -r1.100 -r1.101 --- Kconfig 12 Jul 2006 10:54:07 -0000 1.100 +++ Kconfig 19 Jul 2006 14:33:16 -0000 1.101 @@ -238,32 +238,6 @@ source "arch/sh/mm/Kconfig" -config MEMORY_START - hex "Physical memory start address" - default "0x08000000" - ---help--- - Computers built with Hitachi SuperH processors always - map the ROM starting at address zero. But the processor - does not specify the range that RAM takes. - - The physical memory (RAM) start address will be automatically - set to 08000000. Other platforms, such as the Solution Engine - boards typically map RAM at 0C000000. - - Tweak this only when porting to a new machine which does not - already have a defconfig. Changing it from the known correct - value on any of the known systems will only lead to disaster. - -config MEMORY_SIZE - hex "Physical memory size" - default "0x00400000" - help - This sets the default memory size assumed by your SH kernel. It can - be overridden as normal by the 'mem=' argument on the kernel command - line. If unsure, consult your board specifications or just leave it - as 0x00400000 which was the default value before this became - configurable. - config CF_ENABLER bool "Compact Flash Enabler support" depends on SH_ADX || SH_SOLUTION_ENGINE || SH_UNKNOWN || SH_CAT68701 || SH_SH03 |
|
From: Paul M. <le...@us...> - 2006-07-19 14:33:28
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12846/include/asm-sh Modified Files: page.h Log Message: Make PAGE_OFFSET configurable via CONFIG_PAGE_OFFSET, needed for nommu. Index: page.h =================================================================== RCS file: /cvsroot/linuxsh/linux/include/asm-sh/page.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- page.h 5 Jul 2006 12:33:09 -0000 1.15 +++ page.h 19 Jul 2006 14:33:16 -0000 1.16 @@ -85,7 +85,7 @@ #define __MEMORY_START CONFIG_MEMORY_START #define __MEMORY_SIZE CONFIG_MEMORY_SIZE -#define PAGE_OFFSET (0x80000000UL) +#define PAGE_OFFSET CONFIG_PAGE_OFFSET #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) |
|
From: Paul M. <le...@us...> - 2006-07-19 14:33:26
|
Update of /cvsroot/linuxsh/linux/arch/sh/boot/compressed In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12846/arch/sh/boot/compressed Modified Files: Makefile Log Message: Make PAGE_OFFSET configurable via CONFIG_PAGE_OFFSET, needed for nommu. Index: Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boot/compressed/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile 25 Oct 2004 10:41:02 -0000 1.13 +++ Makefile 19 Jul 2006 14:33:16 -0000 1.14 @@ -18,9 +18,10 @@ # Assign dummy values if these 2 variables are not defined, # in order to suppress error message. # +CONFIG_PAGE_OFFSET ?= 0x80000000 CONFIG_MEMORY_START ?= 0x0c000000 CONFIG_BOOT_LINK_OFFSET ?= 0x00800000 -IMAGE_OFFSET := $(shell printf "0x%8x" $$[0x80000000+$(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET)]) +IMAGE_OFFSET := $(shell printf "0x%8x" $$[$(CONFIG_PAGE_OFFSET)+$(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET)]) LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds |
|
From: Paul M. <le...@us...> - 2006-07-19 14:33:26
|
Update of /cvsroot/linuxsh/linux/arch/sh/kernel In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12846/arch/sh/kernel Modified Files: vmlinux.lds.S Log Message: Make PAGE_OFFSET configurable via CONFIG_PAGE_OFFSET, needed for nommu. Index: vmlinux.lds.S =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/vmlinux.lds.S,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- vmlinux.lds.S 17 Mar 2005 07:49:06 -0000 1.6 +++ vmlinux.lds.S 19 Jul 2006 14:33:16 -0000 1.7 @@ -14,7 +14,7 @@ ENTRY(_start) SECTIONS { - . = 0x80000000 + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET; + . = CONFIG_PAGE_OFFSET + CONFIG_MEMORY_START + CONFIG_ZERO_PAGE_OFFSET; _text = .; /* Text and read-only data */ text = .; /* Text and read-only data */ .empty_zero_page : { |
|
From: Paul M. <le...@us...> - 2006-07-19 14:33:25
|
Update of /cvsroot/linuxsh/linux/arch/sh/mm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv12846/arch/sh/mm Modified Files: Kconfig Log Message: Make PAGE_OFFSET configurable via CONFIG_PAGE_OFFSET, needed for nommu. Index: Kconfig =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/mm/Kconfig,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Kconfig 8 Jan 2006 12:22:58 -0000 1.10 +++ Kconfig 19 Jul 2006 14:33:16 -0000 1.11 @@ -161,6 +161,37 @@ turning this off will boot the kernel on these machines with the MMU implicitly switched off. +config PAGE_OFFSET + hex + default "0x80000000" if MMU + default "0x00000000" + +config MEMORY_START + hex "Physical memory start address" + default "0x08000000" + ---help--- + Computers built with Hitachi SuperH processors always + map the ROM starting at address zero. But the processor + does not specify the range that RAM takes. + + The physical memory (RAM) start address will be automatically + set to 08000000. Other platforms, such as the Solution Engine + boards typically map RAM at 0C000000. + + Tweak this only when porting to a new machine which does not + already have a defconfig. Changing it from the known correct + value on any of the known systems will only lead to disaster. + +config MEMORY_SIZE + hex "Physical memory size" + default "0x00400000" + help + This sets the default memory size assumed by your SH kernel. It can + be overridden as normal by the 'mem=' argument on the kernel command + line. If unsure, consult your board specifications or just leave it + as 0x00400000 which was the default value before this became + configurable. + config 32BIT bool "Support 32-bit physical addressing through PMB" depends on CPU_SH4A |
|
From: Paul M. <le...@us...> - 2006-07-18 13:30:37
|
Update of /cvsroot/linuxsh/linux/drivers/i2c/algos In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18693/drivers/i2c/algos Modified Files: i2c-algo-voyager.h Log Message: Move voyagergx_reg.h somewhere sensible. Index: i2c-algo-voyager.h =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/i2c/algos/i2c-algo-voyager.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- i2c-algo-voyager.h 8 Feb 2006 22:08:10 -0000 1.2 +++ i2c-algo-voyager.h 18 Jul 2006 13:30:29 -0000 1.3 @@ -30,7 +30,7 @@ #define I2C_ALGO_ITE_H 1 #include <linux/i2c.h> -#include <asm/mach/voyagergx_reg.h> +#include <asm/voyagergx.h> /* Example of a sequential read request: struct i2c_iic_msg s_msg; |
|
From: Paul M. <le...@us...> - 2006-07-18 13:30:37
|
Update of /cvsroot/linuxsh/linux/arch/sh/cchips/voyagergx In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18693/arch/sh/cchips/voyagergx Modified Files: irq.c setup.c Log Message: Move voyagergx_reg.h somewhere sensible. Index: irq.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/cchips/voyagergx/irq.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- irq.c 8 Feb 2006 22:08:10 -0000 1.5 +++ irq.c 18 Jul 2006 13:30:28 -0000 1.6 @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/irq.h> -#include <asm/mach/voyagergx_reg.h> +#include <asm/voyagergx.h> static void disable_voyagergx_irq(unsigned int irq) { Index: setup.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/cchips/voyagergx/setup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- setup.c 8 Feb 2006 22:08:10 -0000 1.2 +++ setup.c 18 Jul 2006 13:30:28 -0000 1.3 @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/module.h> #include <asm/io.h> -#include <asm/mach/voyagergx_reg.h> +#include <asm/voyagergx.h> static int __init setup_voyagergx(void) { |
|
From: Paul M. <le...@us...> - 2006-07-18 13:30:37
|
Update of /cvsroot/linuxsh/linux/arch/sh/boards/renesas/rts7751r2d In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18693/arch/sh/boards/renesas/rts7751r2d Modified Files: setup.c Log Message: Move voyagergx_reg.h somewhere sensible. Index: setup.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/boards/renesas/rts7751r2d/setup.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- setup.c 7 Jul 2006 10:41:59 -0000 1.5 +++ setup.c 18 Jul 2006 13:30:28 -0000 1.6 @@ -14,7 +14,7 @@ #include <linux/pm.h> #include <asm/io.h> #include <asm/mach/rts7751r2d.h> -#include <asm/mach/voyagergx_reg.h> +#include <asm/voyagergx.h> static struct plat_serial8250_port uart_platform_data[] = { { |
|
From: Paul M. <le...@us...> - 2006-07-18 13:30:36
|
Update of /cvsroot/linuxsh/linux/include/asm-sh In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18693/include/asm-sh Added Files: voyagergx.h Log Message: Move voyagergx_reg.h somewhere sensible. --- NEW FILE: voyagergx.h --- /* -------------------------------------------------------------------- */ /* voyagergx.h */ /* -------------------------------------------------------------------- */ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Copyright 2003 (c) Lineo uSolutions,Inc. */ /* -------------------------------------------------------------------- */ #ifndef _VOYAGER_GX_REG_H #define _VOYAGER_GX_REG_H #define VOYAGER_BASE 0xb3e00000 #define VOYAGER_USBH_BASE (0x40000 + VOYAGER_BASE) #define VOYAGER_UART_BASE (0x30000 + VOYAGER_BASE) #define VOYAGER_AC97_BASE (0xa0000 + VOYAGER_BASE) #define VOYAGER_IRQ_NUM 32 #define VOYAGER_IRQ_BASE 50 #define VOYAGER_USBH_IRQ VOYAGER_IRQ_BASE + 6 #define VOYAGER_8051_IRQ VOYAGER_IRQ_BASE + 10 #define VOYAGER_UART0_IRQ VOYAGER_IRQ_BASE + 12 #define VOYAGER_UART1_IRQ VOYAGER_IRQ_BASE + 13 #define VOYAGER_AC97_IRQ VOYAGER_IRQ_BASE + 17 /* ----- MISC controle register ------------------------------ */ #define MISC_CTRL (0x000004 + VOYAGER_BASE) #define MISC_CTRL_USBCLK_48 (3 << 28) #define MISC_CTRL_USBCLK_96 (2 << 28) #define MISC_CTRL_USBCLK_CRYSTAL (1 << 28) /* ----- GPIO[31:0] register --------------------------------- */ #define GPIO_MUX_LOW (0x000008 + VOYAGER_BASE) #define GPIO_MUX_LOW_AC97 0x1F000000 #define GPIO_MUX_LOW_8051 0x0000ffff #define GPIO_MUX_LOW_PWM (1 << 29) /* ----- GPIO[63:32] register --------------------------------- */ #define GPIO_MUX_HIGH (0x00000C + VOYAGER_BASE) /* ----- DRAM controle register ------------------------------- */ #define DRAM_CTRL (0x000010 + VOYAGER_BASE) #define DRAM_CTRL_EMBEDDED (1 << 31) #define DRAM_CTRL_CPU_BURST_1 (0 << 28) #define DRAM_CTRL_CPU_BURST_2 (1 << 28) #define DRAM_CTRL_CPU_BURST_4 (2 << 28) #define DRAM_CTRL_CPU_BURST_8 (3 << 28) #define DRAM_CTRL_CPU_CAS_LATENCY (1 << 27) #define DRAM_CTRL_CPU_SIZE_2 (0 << 24) #define DRAM_CTRL_CPU_SIZE_4 (1 << 24) #define DRAM_CTRL_CPU_SIZE_64 (4 << 24) #define DRAM_CTRL_CPU_SIZE_32 (5 << 24) #define DRAM_CTRL_CPU_SIZE_16 (6 << 24) #define DRAM_CTRL_CPU_SIZE_8 (7 << 24) #define DRAM_CTRL_CPU_COLUMN_SIZE_1024 (0 << 22) #define DRAM_CTRL_CPU_COLUMN_SIZE_512 (2 << 22) #define DRAM_CTRL_CPU_COLUMN_SIZE_256 (3 << 22) #define DRAM_CTRL_CPU_ACTIVE_PRECHARGE (1 << 21) #define DRAM_CTRL_CPU_RESET (1 << 20) #define DRAM_CTRL_CPU_BANKS (1 << 19) #define DRAM_CTRL_CPU_WRITE_PRECHARGE (1 << 18) #define DRAM_CTRL_BLOCK_WRITE (1 << 17) #define DRAM_CTRL_REFRESH_COMMAND (1 << 16) #define DRAM_CTRL_SIZE_4 (0 << 13) #define DRAM_CTRL_SIZE_8 (1 << 13) #define DRAM_CTRL_SIZE_16 (2 << 13) #define DRAM_CTRL_SIZE_32 (3 << 13) #define DRAM_CTRL_SIZE_64 (4 << 13) #define DRAM_CTRL_SIZE_2 (5 << 13) #define DRAM_CTRL_COLUMN_SIZE_256 (0 << 11) #define DRAM_CTRL_COLUMN_SIZE_512 (2 << 11) #define DRAM_CTRL_COLUMN_SIZE_1024 (3 << 11) #define DRAM_CTRL_BLOCK_WRITE_TIME (1 << 10) #define DRAM_CTRL_BLOCK_WRITE_PRECHARGE (1 << 9) #define DRAM_CTRL_ACTIVE_PRECHARGE (1 << 8) #define DRAM_CTRL_RESET (1 << 7) #define DRAM_CTRL_REMAIN_ACTIVE (1 << 6) #define DRAM_CTRL_BANKS (1 << 1) #define DRAM_CTRL_WRITE_PRECHARGE (1 << 0) /* ----- Arvitration control register -------------------------- */ #define ARBITRATION_CTRL (0x000014 + VOYAGER_BASE) #define ARBITRATION_CTRL_CPUMEM (1 << 29) #define ARBITRATION_CTRL_INTMEM (1 << 28) #define ARBITRATION_CTRL_USB_OFF (0 << 24) #define ARBITRATION_CTRL_USB_PRIORITY_1 (1 << 24) #define ARBITRATION_CTRL_USB_PRIORITY_2 (2 << 24) #define ARBITRATION_CTRL_USB_PRIORITY_3 (3 << 24) #define ARBITRATION_CTRL_USB_PRIORITY_4 (4 << 24) #define ARBITRATION_CTRL_USB_PRIORITY_5 (5 << 24) #define ARBITRATION_CTRL_USB_PRIORITY_6 (6 << 24) #define ARBITRATION_CTRL_USB_PRIORITY_7 (7 << 24) #define ARBITRATION_CTRL_PANEL_OFF (0 << 20) #define ARBITRATION_CTRL_PANEL_PRIORITY_1 (1 << 20) #define ARBITRATION_CTRL_PANEL_PRIORITY_2 (2 << 20) #define ARBITRATION_CTRL_PANEL_PRIORITY_3 (3 << 20) #define ARBITRATION_CTRL_PANEL_PRIORITY_4 (4 << 20) #define ARBITRATION_CTRL_PANEL_PRIORITY_5 (5 << 20) #define ARBITRATION_CTRL_PANEL_PRIORITY_6 (6 << 20) #define ARBITRATION_CTRL_PANEL_PRIORITY_7 (7 << 20) #define ARBITRATION_CTRL_ZVPORT_OFF (0 << 16) #define ARBITRATION_CTRL_ZVPORTL_PRIORITY_1 (1 << 16) #define ARBITRATION_CTRL_ZVPORTL_PRIORITY_2 (2 << 16) #define ARBITRATION_CTRL_ZVPORTL_PRIORITY_3 (3 << 16) #define ARBITRATION_CTRL_ZVPORTL_PRIORITY_4 (4 << 16) #define ARBITRATION_CTRL_ZVPORTL_PRIORITY_5 (5 << 16) #define ARBITRATION_CTRL_ZVPORTL_PRIORITY_6 (6 << 16) #define ARBITRATION_CTRL_ZVPORTL_PRIORITY_7 (7 << 16) #define ARBITRATION_CTRL_CMD_INTPR_OFF (0 << 12) #define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_1 (1 << 12) #define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_2 (2 << 12) #define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_3 (3 << 12) #define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_4 (4 << 12) #define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_5 (5 << 12) #define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_6 (6 << 12) #define ARBITRATION_CTRL_CMD_INTPR_PRIORITY_7 (7 << 12) #define ARBITRATION_CTRL_DMA_OFF (0 << 8) #define ARBITRATION_CTRL_DMA_PRIORITY_1 (1 << 8) #define ARBITRATION_CTRL_DMA_PRIORITY_2 (2 << 8) #define ARBITRATION_CTRL_DMA_PRIORITY_3 (3 << 8) #define ARBITRATION_CTRL_DMA_PRIORITY_4 (4 << 8) #define ARBITRATION_CTRL_DMA_PRIORITY_5 (5 << 8) #define ARBITRATION_CTRL_DMA_PRIORITY_6 (6 << 8) #define ARBITRATION_CTRL_DMA_PRIORITY_7 (7 << 8) #define ARBITRATION_CTRL_VIDEO_OFF (0 << 4) #define ARBITRATION_CTRL_VIDEO_PRIORITY_1 (1 << 4) #define ARBITRATION_CTRL_VIDEO_PRIORITY_2 (2 << 4) #define ARBITRATION_CTRL_VIDEO_PRIORITY_3 (3 << 4) #define ARBITRATION_CTRL_VIDEO_PRIORITY_4 (4 << 4) #define ARBITRATION_CTRL_VIDEO_PRIORITY_5 (5 << 4) #define ARBITRATION_CTRL_VIDEO_PRIORITY_6 (6 << 4) #define ARBITRATION_CTRL_VIDEO_PRIORITY_7 (7 << 4) #define ARBITRATION_CTRL_CRT_OFF (0 << 0) #define ARBITRATION_CTRL_CRT_PRIORITY_1 (1 << 0) #define ARBITRATION_CTRL_CRT_PRIORITY_2 (2 << 0) #define ARBITRATION_CTRL_CRT_PRIORITY_3 (3 << 0) #define ARBITRATION_CTRL_CRT_PRIORITY_4 (4 << 0) #define ARBITRATION_CTRL_CRT_PRIORITY_5 (5 << 0) #define ARBITRATION_CTRL_CRT_PRIORITY_6 (6 << 0) #define ARBITRATION_CTRL_CRT_PRIORITY_7 (7 << 0) /* ----- Command list status register -------------------------- */ #define CMD_INTPR_STATUS (0x000024 + VOYAGER_BASE) /* ----- Interrupt status register ----------------------------- */ #define INT_STATUS (0x00002c + VOYAGER_BASE) #define INT_STATUS_UH (1 << 6) #define INT_STATUS_MC (1 << 10) #define INT_STATUS_U0 (1 << 12) #define INT_STATUS_U1 (1 << 13) #define INT_STATUS_AC (1 << 17) /* ----- Interrupt mask register ------------------------------ */ #define VOYAGER_INT_MASK (0x000030 + VOYAGER_BASE) #define VOYAGER_INT_MASK_AC (1 << 17) /* ----- Current Gate register ---------------------------------*/ #define CURRENT_GATE (0x000038 + VOYAGER_BASE) /* ----- Power mode 0 gate register --------------------------- */ #define POWER_MODE0_GATE (0x000040 + VOYAGER_BASE) #define POWER_MODE0_GATE_G (1 << 6) #define POWER_MODE0_GATE_U0 (1 << 7) #define POWER_MODE0_GATE_U1 (1 << 8) #define POWER_MODE0_GATE_UH (1 << 11) #define POWER_MODE0_GATE_AC (1 << 18) /* ----- Power mode 1 gate register --------------------------- */ #define POWER_MODE1_GATE (0x000048 + VOYAGER_BASE) #define POWER_MODE1_GATE_G (1 << 6) #define POWER_MODE1_GATE_U0 (1 << 7) #define POWER_MODE1_GATE_U1 (1 << 8) #define POWER_MODE1_GATE_UH (1 << 11) #define POWER_MODE1_GATE_AC (1 << 18) /* ----- Power mode 0 clock register -------------------------- */ #define POWER_MODE0_CLOCK (0x000044 + VOYAGER_BASE) /* ----- Power mode 1 clock register -------------------------- */ #define POWER_MODE1_CLOCK (0x00004C + VOYAGER_BASE) /* ----- Power mode controll register ------------------------- */ #define POWER_MODE_CTRL (0x000054 + VOYAGER_BASE) /* ----- Miscellaneous Timing register ------------------------ */ #define SYSTEM_DRAM_CTRL (0x000068 + VOYAGER_BASE) /* ----- PWM register ------------------------------------------*/ #define PWM_0 (0x010020 + VOYAGER_BASE) #define PWM_0_HC(x) (((x)&0x0fff)<<20) #define PWM_0_LC(x) (((x)&0x0fff)<<8 ) #define PWM_0_CLK_DEV(x) (((x)&0x000f)<<4 ) #define PWM_0_EN (1<<0) /* ----- I2C register ----------------------------------------- */ #define I2C_BYTECOUNT (0x010040 + VOYAGER_BASE) #define I2C_CONTROL (0x010041 + VOYAGER_BASE) #define I2C_STATUS (0x010042 + VOYAGER_BASE) #define I2C_RESET (0x010042 + VOYAGER_BASE) #define I2C_SADDRESS (0x010043 + VOYAGER_BASE) #define I2C_DATA (0x010044 + VOYAGER_BASE) /* ----- Controle register bits ----------------------------------------- */ #define I2C_CONTROL_E (1 << 0) #define I2C_CONTROL_MODE (1 << 1) #define I2C_CONTROL_STATUS (1 << 2) #define I2C_CONTROL_INT (1 << 4) #define I2C_CONTROL_INTACK (1 << 5) #define I2C_CONTROL_REPEAT (1 << 6) /* ----- Status register bits ----------------------------------------- */ #define I2C_STATUS_BUSY (1 << 0) #define I2C_STATUS_ACK (1 << 1) #define I2C_STATUS_ERROR (1 << 2) #define I2C_STATUS_COMPLETE (1 << 3) /* ----- Reset register ---------------------------------------------- */ #define I2C_RESET_ERROR (1 << 2) /* ----- transmission frequencies ------------------------------------- */ #define I2C_SADDRESS_SELECT (1 << 0) /* ----- Display Controll register ----------------------------------------- */ #define PANEL_DISPLAY_CTRL (0x080000 + VOYAGER_BASE) #define PANEL_DISPLAY_CTRL_BIAS (1<<26) #define PANEL_PAN_CTRL (0x080004 + VOYAGER_BASE) #define PANEL_COLOR_KEY (0x080008 + VOYAGER_BASE) #define PANEL_FB_ADDRESS (0x08000C + VOYAGER_BASE) #define PANEL_FB_WIDTH (0x080010 + VOYAGER_BASE) #define PANEL_WINDOW_WIDTH (0x080014 + VOYAGER_BASE) #define PANEL_WINDOW_HEIGHT (0x080018 + VOYAGER_BASE) #define PANEL_PLANE_TL (0x08001C + VOYAGER_BASE) #define PANEL_PLANE_BR (0x080020 + VOYAGER_BASE) #define PANEL_HORIZONTAL_TOTAL (0x080024 + VOYAGER_BASE) #define PANEL_HORIZONTAL_SYNC (0x080028 + VOYAGER_BASE) #define PANEL_VERTICAL_TOTAL (0x08002C + VOYAGER_BASE) #define PANEL_VERTICAL_SYNC (0x080030 + VOYAGER_BASE) #define PANEL_CURRENT_LINE (0x080034 + VOYAGER_BASE) #define VIDEO_DISPLAY_CTRL (0x080040 + VOYAGER_BASE) #define VIDEO_FB_0_ADDRESS (0x080044 + VOYAGER_BASE) #define VIDEO_FB_WIDTH (0x080048 + VOYAGER_BASE) #define VIDEO_FB_0_LAST_ADDRESS (0x08004C + VOYAGER_BASE) #define VIDEO_PLANE_TL (0x080050 + VOYAGER_BASE) #define VIDEO_PLANE_BR (0x080054 + VOYAGER_BASE) #define VIDEO_SCALE (0x080058 + VOYAGER_BASE) #define VIDEO_INITIAL_SCALE (0x08005C + VOYAGER_BASE) #define VIDEO_YUV_CONSTANTS (0x080060 + VOYAGER_BASE) #define VIDEO_FB_1_ADDRESS (0x080064 + VOYAGER_BASE) #define VIDEO_FB_1_LAST_ADDRESS (0x080068 + VOYAGER_BASE) #define VIDEO_ALPHA_DISPLAY_CTRL (0x080080 + VOYAGER_BASE) #define VIDEO_ALPHA_FB_ADDRESS (0x080084 + VOYAGER_BASE) #define VIDEO_ALPHA_FB_WIDTH (0x080088 + VOYAGER_BASE) #define VIDEO_ALPHA_FB_LAST_ADDRESS (0x08008C + VOYAGER_BASE) #define VIDEO_ALPHA_PLANE_TL (0x080090 + VOYAGER_BASE) #define VIDEO_ALPHA_PLANE_BR (0x080094 + VOYAGER_BASE) #define VIDEO_ALPHA_SCALE (0x080098 + VOYAGER_BASE) #define VIDEO_ALPHA_INITIAL_SCALE (0x08009C + VOYAGER_BASE) #define VIDEO_ALPHA_CHROMA_KEY (0x0800A0 + VOYAGER_BASE) #define PANEL_HWC_ADDRESS (0x0800F0 + VOYAGER_BASE) #define PANEL_HWC_LOCATION (0x0800F4 + VOYAGER_BASE) #define PANEL_HWC_COLOR_12 (0x0800F8 + VOYAGER_BASE) #define PANEL_HWC_COLOR_3 (0x0800FC + VOYAGER_BASE) #define ALPHA_DISPLAY_CTRL (0x080100 + VOYAGER_BASE) #define ALPHA_FB_ADDRESS (0x080104 + VOYAGER_BASE) #define ALPHA_FB_WIDTH (0x080108 + VOYAGER_BASE) #define ALPHA_PLANE_TL (0x08010C + VOYAGER_BASE) #define ALPHA_PLANE_BR (0x080110 + VOYAGER_BASE) #define ALPHA_CHROMA_KEY (0x080114 + VOYAGER_BASE) #define CRT_DISPLAY_CTRL (0x080200 + VOYAGER_BASE) #define CRT_FB_ADDRESS (0x080204 + VOYAGER_BASE) #define CRT_FB_WIDTH (0x080208 + VOYAGER_BASE) #define CRT_HORIZONTAL_TOTAL (0x08020C + VOYAGER_BASE) #define CRT_HORIZONTAL_SYNC (0x080210 + VOYAGER_BASE) #define CRT_VERTICAL_TOTAL (0x080214 + VOYAGER_BASE) #define CRT_VERTICAL_SYNC (0x080218 + VOYAGER_BASE) #define CRT_SIGNATURE_ANALYZER (0x08021C + VOYAGER_BASE) #define CRT_CURRENT_LINE (0x080220 + VOYAGER_BASE) #define CRT_MONITOR_DETECT (0x080224 + VOYAGER_BASE) #define CRT_HWC_ADDRESS (0x080230 + VOYAGER_BASE) #define CRT_HWC_LOCATION (0x080234 + VOYAGER_BASE) #define CRT_HWC_COLOR_12 (0x080238 + VOYAGER_BASE) #define CRT_HWC_COLOR_3 (0x08023C + VOYAGER_BASE) #define CRT_PALETTE_RAM (0x080400 + VOYAGER_BASE) #define PANEL_PALETTE_RAM (0x080800 + VOYAGER_BASE) #define VIDEO_PALETTE_RAM (0x080C00 + VOYAGER_BASE) /* ----- 8051 Controle register ----------------------------------------- */ #define VOYAGER_8051_BASE (0x000c0000 + VOYAGER_BASE) #define VOYAGER_8051_RESET (0x000b0000 + VOYAGER_BASE) #define VOYAGER_8051_SELECT (0x000b0004 + VOYAGER_BASE) #define VOYAGER_8051_CPU_INT (0x000b000c + VOYAGER_BASE) /* ----- AC97 Controle register ----------------------------------------- */ #define AC97_TX_SLOT0 (0x00000000 + VOYAGER_AC97_BASE) #define AC97_CONTROL_STATUS (0x00000080 + VOYAGER_AC97_BASE) #define AC97C_READ (1 << 19) #define AC97C_WD_BIT (1 << 2) #define AC97C_INDEX_MASK 0x7f /* -------------------------------------------------------------------- */ #endif /* _VOYAGER_GX_REG_H */ |
|
From: Paul M. <le...@us...> - 2006-07-18 13:30:36
|
Update of /cvsroot/linuxsh/linux/drivers/usb/host In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18693/drivers/usb/host Modified Files: ohci-voyagergx.c Log Message: Move voyagergx_reg.h somewhere sensible. Index: ohci-voyagergx.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/usb/host/ohci-voyagergx.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ohci-voyagergx.c 27 Jan 2006 16:11:52 -0000 1.4 +++ ohci-voyagergx.c 18 Jul 2006 13:30:29 -0000 1.5 @@ -23,7 +23,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/platform_device.h> -#include <asm/mach/voyagergx_reg.h> +#include <asm/voyagergx.h> extern int usb_disabled(void); |
|
From: Paul M. <le...@us...> - 2006-07-18 13:30:36
|
Update of /cvsroot/linuxsh/linux/include/asm-sh/rts7751r2d In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18693/include/asm-sh/rts7751r2d Removed Files: voyagergx_reg.h Log Message: Move voyagergx_reg.h somewhere sensible. --- voyagergx_reg.h DELETED --- |
|
From: Paul M. <le...@us...> - 2006-07-18 13:30:36
|
Update of /cvsroot/linuxsh/linux/sound/oss In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18693/sound/oss Modified Files: voyagergx_8051.c voyagergx_sound.c Log Message: Move voyagergx_reg.h somewhere sensible. Index: voyagergx_8051.c =================================================================== RCS file: /cvsroot/linuxsh/linux/sound/oss/voyagergx_8051.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- voyagergx_8051.c 26 Jun 2004 15:29:38 -0000 1.2 +++ voyagergx_8051.c 18 Jul 2006 13:30:29 -0000 1.3 @@ -1,6 +1,6 @@ #include <linux/module.h> #include <linux/delay.h> -#include <asm/rts7751r2d/voyagergx_reg.h> +#include <asm/voyagergx.h> #include "voyagergx_sound.h" #define DELAY_8051 300000 Index: voyagergx_sound.c =================================================================== RCS file: /cvsroot/linuxsh/linux/sound/oss/voyagergx_sound.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- voyagergx_sound.c 23 Dec 2005 08:25:06 -0000 1.4 +++ voyagergx_sound.c 18 Jul 2006 13:30:30 -0000 1.5 @@ -36,7 +36,7 @@ #include <asm/io.h> #include <asm/uaccess.h> #include <asm/hardirq.h> -#include <asm/rts7751r2d/voyagergx_reg.h> +#include <asm/voyagergx.h> #include <asm/irq.h> #include "voyagergx_sound.h" |
