diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/floppy.h | 32 | ||||
| -rw-r--r-- | include/asm-alpha/keyboard.h | 46 | ||||
| -rw-r--r-- | include/asm-arm/proc-armo/pgtable.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/proc-armv/pgtable.h | 69 | ||||
| -rw-r--r-- | include/asm-i386/floppy.h | 39 | ||||
| -rw-r--r-- | include/asm-i386/pgtable.h | 4 | ||||
| -rw-r--r-- | include/asm-i386/socket.h | 12 | ||||
| -rw-r--r-- | include/asm-ppc/floppy.h | 32 | ||||
| -rw-r--r-- | include/asm-ppc/pgtable.h | 2 | ||||
| -rw-r--r-- | include/asm-sh/ioctl.h | 2 | ||||
| -rw-r--r-- | include/asm-sh/namei.h | 2 | ||||
| -rw-r--r-- | include/asm-sh/uaccess.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc/floppy.h | 32 | ||||
| -rw-r--r-- | include/asm-sparc/param.h | 1 | ||||
| -rw-r--r-- | include/asm-sparc64/floppy.h | 53 | ||||
| -rw-r--r-- | include/linux/elf.h | 169 |
16 files changed, 181 insertions, 318 deletions
diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h index 36fb2c5e9..8203920b9 100644 --- a/include/asm-alpha/floppy.h +++ b/include/asm-alpha/floppy.h @@ -15,23 +15,21 @@ #define fd_inb(port) inb_p(port) #define fd_outb(port,value) outb_p(port,value) -#define fd_enable_dma(channel) enable_dma(channel) -#define fd_disable_dma(channel) disable_dma(channel) -#define fd_request_dma(channel) request_dma(channel, "floppy") -#define fd_free_dma(channel) free_dma(channel) -#define fd_clear_dma_ff(channel) clear_dma_ff(channel) -#define fd_set_dma_mode(channel, mode) set_dma_mode(channel, mode) -#define fd_set_dma_addr(channel, addr) set_dma_addr(channel,virt_to_bus(addr)) -#define fd_set_dma_count(channel, count) set_dma_count(channel,count) - -#define fd_enable_irq(irq) enable_irq(irq) -#define fd_disable_irq(irq) disable_irq(irq) -#define fd_request_irq(irq) request_irq(irq, \ - floppy_interrupt, \ - SA_INTERRUPT \ - | SA_SAMPLE_RANDOM, \ - "floppy", NULL) -#define fd_free_irq(irq) free_irq(irq, NULL); +#define fd_enable_dma() enable_dma(FLOPPY_DMA) +#define fd_disable_dma() disable_dma(FLOPPY_DMA) +#define fd_request_dma() request_dma(FLOPPY_DMA,"floppy") +#define fd_free_dma() free_dma(FLOPPY_DMA) +#define fd_clear_dma_ff() clear_dma_ff(FLOPPY_DMA) +#define fd_set_dma_mode(mode) set_dma_mode(FLOPPY_DMA,mode) +#define fd_set_dma_addr(addr) set_dma_addr(FLOPPY_DMA,virt_to_bus(addr)) +#define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count) +#define fd_enable_irq() enable_irq(FLOPPY_IRQ) +#define fd_disable_irq() disable_irq(FLOPPY_IRQ) +#define fd_cacheflush(addr,size) /* nothing */ +#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \ + SA_INTERRUPT|SA_SAMPLE_RANDOM, \ + "floppy", NULL) +#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); __inline__ void virtual_dma_init(void) { diff --git a/include/asm-alpha/keyboard.h b/include/asm-alpha/keyboard.h index 429898812..eb0047023 100644 --- a/include/asm-alpha/keyboard.h +++ b/include/asm-alpha/keyboard.h @@ -2,8 +2,6 @@ * linux/include/asm-alpha/keyboard.h * * Created 3 Nov 1996 by Geert Uytterhoeven - * - * $Id: keyboard.h,v 1.9 1999/11/19 20:35:47 ralf Exp $ */ /* @@ -15,10 +13,6 @@ #ifdef __KERNEL__ -#include <linux/config.h> -#include <linux/ioport.h> -#include <asm/io.h> - #define KEYBOARD_IRQ 1 #define DISABLE_KBD_DURING_INTERRUPTS 0 @@ -39,42 +33,9 @@ extern unsigned char pckbd_sysrq_xlate[128]; #define kbd_init_hw pckbd_init_hw #define kbd_sysrq_xlate pckbd_sysrq_xlate -#define SYSRQ_KEY 0x54 - -/* - * keyboard controller registers - */ -#define KBD_STATUS_REG (unsigned int) 0x64 -#define KBD_CNTL_REG (unsigned int) 0x64 -#define KBD_DATA_REG (unsigned int) 0x60 - -/* How to access the keyboard macros on this platform. */ -#define kbd_read_input() inb(KBD_DATA_REG) -#define kbd_read_status() inb(KBD_STATUS_REG) -#define kbd_write_output(val) outb(val, KBD_DATA_REG) -#define kbd_write_command(val) outb(val, KBD_CNTL_REG) +#define INIT_KBD -/* Some stoneage hardware needs delays after some operations. */ -#define kbd_pause() do { } while(0) - -/* Get the keyboard controller registers (incomplete decode) */ -#define kbd_request_region() request_region(0x60, 16, "keyboard") - -#define kbd_request_irq() request_irq(KEYBOARD_IRQ, keyboard_interrupt, 0, \ - "keyboard", NULL); - -/* - * Machine specific bits for the PS/2 driver - */ -#if defined(__alpha__) && !defined(CONFIG_PCI) -# define AUX_IRQ 9 /* Jensen is odd indeed */ -#else -# define AUX_IRQ 12 -#endif - -#define aux_request_irq(handler, dev_id) request_irq(AUX_IRQ, handler, 0, \ - "PS/2 Mouse", NULL) -#define aux_free_irq(dev_id) free_irq(AUX_IRQ, NULL) +#define SYSRQ_KEY 0x54 /* resource allocation */ #define kbd_request_region() @@ -102,4 +63,5 @@ extern unsigned char pckbd_sysrq_xlate[128]; #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id) #endif /* __KERNEL__ */ -#endif /* __ASM_ALPHA_KEYBOARD_H */ + +#endif /* __ASMalpha_KEYBOARD_H */ diff --git a/include/asm-arm/proc-armo/pgtable.h b/include/asm-arm/proc-armo/pgtable.h index 5a0b4e833..be9174ffa 100644 --- a/include/asm-arm/proc-armo/pgtable.h +++ b/include/asm-arm/proc-armo/pgtable.h @@ -8,8 +8,6 @@ #ifndef __ASM_PROC_PGTABLE_H #define __ASM_PROC_PGTABLE_H -#include <asm/proc/domain.h> - /* * PMD_SHIFT determines the size of the area a second-level page table can map */ diff --git a/include/asm-arm/proc-armv/pgtable.h b/include/asm-arm/proc-armv/pgtable.h index 6ea25c125..d4f416d37 100644 --- a/include/asm-arm/proc-armv/pgtable.h +++ b/include/asm-arm/proc-armv/pgtable.h @@ -49,75 +49,6 @@ #define VMALLOC_VMADDR(x) ((unsigned long)(x)) #define VMALLOC_END (PAGE_OFFSET + 0x10000000) - -/* - * Domains - */ -#define DOMAIN_USER 0 -#define DOMAIN_KERNEL 1 -#define DOMAIN_TABLE 1 -#define DOMAIN_IO 2 - - - -#undef TEST_VERIFY_AREA - -/* - * The sa110 doesn't have any external MMU info: the kernel page - * tables contain all the necessary information. - */ -extern __inline__ void update_mmu_cache(struct vm_area_struct * vma, - unsigned long address, pte_t pte) -{ -} - - -/* - * BAD_PAGETABLE is used when we need a bogus page-table, while - * BAD_PAGE is used for a bogus page. - * - * ZERO_PAGE is a global shared page that is always zero: used - * for zero-mapped memory areas etc.. - */ -extern pte_t __bad_page(void); -extern pte_t * __bad_pagetable(void); -extern unsigned long *empty_zero_page; - -#define BAD_PAGETABLE __bad_pagetable() -#define BAD_PAGE __bad_page() -#define ZERO_PAGE(vaddr) ((unsigned long) empty_zero_page) - -/* number of bits that fit into a memory pointer */ -#define BYTES_PER_PTR (sizeof(unsigned long)) -#define BITS_PER_PTR (8*BYTES_PER_PTR) - -/* to align the pointer to a pointer address */ -#define PTR_MASK (~(sizeof(void*)-1)) - -/* sizeof(void*)==1<<SIZEOF_PTR_LOG2 */ -#define SIZEOF_PTR_LOG2 2 - -/* to find an entry in a page-table */ -#define PAGE_PTR(address) \ -((unsigned long)(address)>>(PAGE_SHIFT-SIZEOF_PTR_LOG2)&PTR_MASK&~PAGE_MASK) - -/* to set the page-dir - * Note that we need to flush the cache and TLBs - * if we are affecting the current task. - */ -#define SET_PAGE_DIR(tsk,pgdir) \ -do { \ - tsk->tss.memmap = __virt_to_phys((unsigned long)pgdir); \ - if ((tsk) == current) { \ - flush_cache_all(); \ - __asm__ __volatile__( \ - "mcr%? p15, 0, %0, c2, c0, 0\n" \ - : : "r" (tsk->tss.memmap)); \ - flush_tlb_all(); \ - } \ -} while (0) - - extern unsigned long get_page_2k(int priority); extern void free_page_2k(unsigned long page); diff --git a/include/asm-i386/floppy.h b/include/asm-i386/floppy.h index 2b548bb1c..b941776f5 100644 --- a/include/asm-i386/floppy.h +++ b/include/asm-i386/floppy.h @@ -1,8 +1,18 @@ +/* + * Architecture specific parts of the Floppy driver + * + * 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. + * + * Copyright (C) 1995 + */ #ifndef __ASM_I386_FLOPPY_H #define __ASM_I386_FLOPPY_H #include <linux/vmalloc.h> + /* * The DMA channel used by the floppy controller cannot access data at * addresses >= 16MB @@ -23,13 +33,14 @@ #define fd_inb(port) inb_p(port) #define fd_outb(port,value) outb_p(port,value) -#define fd_request_dma() CSW._request_dma(FLOPPY_DMA,"floppy") -#define fd_free_dma() CSW._free_dma(FLOPPY_DMA) -#define fd_enable_irq(irq) enable_irq(irq) -#define fd_disable_irq(irq) disable_irq(irq) -#define fd_free_irq(irq) free_irq(irq, NULL) -#define fd_get_dma_residue(channel) SW._get_dma_residue(channel) -#define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) + +#define fd_request_dma() CSW._request_dma(FLOPPY_DMA,"floppy") +#define fd_free_dma() CSW._free_dma(FLOPPY_DMA) +#define fd_enable_irq() enable_irq(FLOPPY_IRQ) +#define fd_disable_irq() disable_irq(FLOPPY_IRQ) +#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) +#define fd_get_dma_residue() SW._get_dma_residue(FLOPPY_DMA) +#define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) #define fd_dma_setup(addr, size, mode, io) SW._dma_setup(addr, size, mode, io) #define FLOPPY_CAN_FALLBACK_ON_NODMA @@ -177,20 +188,6 @@ static int fd_request_irq(void) } -/* Pure 2^n version of get_order */ -extern __inline__ int __get_order(unsigned long size) -{ - int order; - - size = (size-1) >> (PAGE_SHIFT-1); - order = -1; - do { - size >>= 1; - order++; - } while (size); - return order; -} - static unsigned long dma_mem_alloc(unsigned long size) { return __get_dma_pages(GFP_KERNEL,__get_order(size)); diff --git a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h index abd454b40..fdc7b0107 100644 --- a/include/asm-i386/pgtable.h +++ b/include/asm-i386/pgtable.h @@ -225,12 +225,12 @@ extern unsigned long pg0[1024]; * for zero-mapped memory areas etc.. */ extern unsigned long empty_zero_page[1024]; -#define ZERO_PAGE(vaddr) ((unsigned long) empty_zero_page) +#define ZERO_PAGE(vaddr) (mem_map + MAP_NR(empty_zero_page)) /* * Handling allocation failures during page table setup. */ -extern void __handle_bad_pmd (pmd_t * pmd); +extern void __handle_bad_pmd(pmd_t * pmd); extern void __handle_bad_pmd_kernel(pmd_t * pmd); #define pte_none(x) (!pte_val(x)) diff --git a/include/asm-i386/socket.h b/include/asm-i386/socket.h index 1a2ae578f..cc27f2e32 100644 --- a/include/asm-i386/socket.h +++ b/include/asm-i386/socket.h @@ -39,16 +39,4 @@ #define SO_ATTACH_FILTER 26 #define SO_DETACH_FILTER 27 -/* Socket types. */ -#define SOCK_STREAM 1 /* stream (connection) socket */ -#define SOCK_DGRAM 2 /* datagram (conn.less) socket */ -#define SOCK_RAW 3 /* raw socket */ -#define SOCK_RDM 4 /* reliably-delivered message */ -#define SOCK_SEQPACKET 5 /* sequential packet socket */ -#define SOCK_PACKET 10 /* linux specific way of */ - /* getting packets at the dev */ - /* level. For writing rarp and */ - /* other similar things on the */ - /* user level. */ - #endif /* _ASM_SOCKET_H */ diff --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h index eb7269cbc..f12eae65f 100644 --- a/include/asm-ppc/floppy.h +++ b/include/asm-ppc/floppy.h @@ -13,23 +13,21 @@ #define fd_inb(port) inb_p(port) #define fd_outb(port,value) outb_p(port,value) -#define fd_enable_dma(channel) enable_dma(channel) -#define fd_disable_dma(channel) disable_dma(channel) -#define fd_request_dma(channel) request_dma(channel,"floppy") -#define fd_free_dma(channel) free_dma(channel) -#define fd_clear_dma_ff(channel) clear_dma_ff(channel) -#define fd_set_dma_mode(channel,mode) set_dma_mode(channel,mode) -#define fd_set_dma_addr(channel,addr) set_dma_addr(channel, \ - (unsigned int)virt_to_bus(addr)) -#define fd_set_dma_count(channel,count) set_dma_count(channel, count) - -#define fd_enable_irq(irq) enable_irq(irq) -#define fd_disable_irq(irq) disable_irq(irq) -#define fd_request_irq() request_irq(irq, floppy_interrupt, \ - SA_INTERRUPT \ - | SA_SAMPLE_RANDOM, \ - "floppy", NULL) -#define fd_free_irq(irq) free_irq(irq, NULL); +#define fd_enable_dma() enable_dma(FLOPPY_DMA) +#define fd_disable_dma() disable_dma(FLOPPY_DMA) +#define fd_request_dma() request_dma(FLOPPY_DMA,"floppy") +#define fd_free_dma() free_dma(FLOPPY_DMA) +#define fd_clear_dma_ff() clear_dma_ff(FLOPPY_DMA) +#define fd_set_dma_mode(mode) set_dma_mode(FLOPPY_DMA,mode) +#define fd_set_dma_addr(addr) set_dma_addr(FLOPPY_DMA,(unsigned int)virt_to_bus(addr)) +#define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count) +#define fd_enable_irq() enable_irq(FLOPPY_IRQ) +#define fd_disable_irq() disable_irq(FLOPPY_IRQ) +#define fd_cacheflush(addr,size) /* nothing */ +#define fd_request_irq() request_irq(FLOPPY_IRQ, floppy_interrupt, \ + SA_INTERRUPT|SA_SAMPLE_RANDOM, \ + "floppy", NULL) +#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL); __inline__ void virtual_dma_init(void) { diff --git a/include/asm-ppc/pgtable.h b/include/asm-ppc/pgtable.h index ee42b4547..ad2eba41f 100644 --- a/include/asm-ppc/pgtable.h +++ b/include/asm-ppc/pgtable.h @@ -243,12 +243,12 @@ extern unsigned long empty_zero_page[1024]; * ZERO_PAGE is a global shared page that is always zero: used * for zero-mapped memory areas etc.. */ -#ifndef __ASSEMBLY__ extern pte_t __bad_page(void); extern pte_t * __bad_pagetable(void); #define BAD_PAGETABLE __bad_pagetable() #define BAD_PAGE __bad_page() +#endif /* __ASSEMBLY__ */ /* number of bits that fit into a memory pointer */ #define BITS_PER_PTR (8*sizeof(unsigned long)) diff --git a/include/asm-sh/ioctl.h b/include/asm-sh/ioctl.h index 11b8153ac..5f87787e8 100644 --- a/include/asm-sh/ioctl.h +++ b/include/asm-sh/ioctl.h @@ -1,4 +1,4 @@ -/* $Id: ioctl.h,v 1.5 1993/07/19 21:53:50 root Exp root $ +/* $Id: ioctl.h,v 1.1 1999/09/18 17:29:53 gniibe Exp $ * * linux/ioctl.h for Linux by H.H. Bergman. */ diff --git a/include/asm-sh/namei.h b/include/asm-sh/namei.h index 47043e64e..582fc77e3 100644 --- a/include/asm-sh/namei.h +++ b/include/asm-sh/namei.h @@ -1,4 +1,4 @@ -/* $Id: namei.h,v 1.1 1996/12/13 14:48:21 jj Exp $ +/* $Id: namei.h,v 1.1 1999/09/18 17:30:11 gniibe Exp $ * linux/include/asm-sh/namei.h * * Included from linux/fs/namei.c diff --git a/include/asm-sh/uaccess.h b/include/asm-sh/uaccess.h index 81a426d8d..4d888da0a 100644 --- a/include/asm-sh/uaccess.h +++ b/include/asm-sh/uaccess.h @@ -1,4 +1,4 @@ -/* $Id$ +/* $Id: uaccess.h,v 1.3 1999/10/12 14:46:20 gniibe Exp $ * * User space memory access functions * diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h index a8e415dbd..9b76a32c4 100644 --- a/include/asm-sparc/floppy.h +++ b/include/asm-sparc/floppy.h @@ -59,23 +59,21 @@ struct sun_floppy_ops { static struct sun_floppy_ops sun_fdops; -#define fd_inb(port) sun_fdops.fd_inb(port) -#define fd_outb(value,port) sun_fdops.fd_outb(value,port) - -#define fd_enable_dma(channel) sun_fd_enable_dma() -#define fd_disable_dma(channel) sun_fd_disable_dma() -#define fd_request_dma(channel) (0) /* nothing... */ -#define fd_free_dma(channel) /* nothing... */ -#define fd_clear_dma_ff(channel) /* nothing... */ -#define fd_set_dma_mode(channel,mode) sun_fd_set_dma_mode(mode) -#define fd_set_dma_addr(channel,addr) sun_fd_set_dma_addr(addr) -#define fd_set_dma_count(channel,count) sun_fd_set_dma_count(count) - -#define fd_enable_irq(irq) /* nothing... */ -#define fd_disable_irq(irq) /* nothing... */ -#define fd_request_irq(irq) sun_fd_request_irq() -#define fd_free_irq(irq) /* nothing... */ - +#define fd_inb(port) sun_fdops.fd_inb(port) +#define fd_outb(value,port) sun_fdops.fd_outb(value,port) +#define fd_enable_dma() sun_fd_enable_dma() +#define fd_disable_dma() sun_fd_disable_dma() +#define fd_request_dma() (0) /* nothing... */ +#define fd_free_dma() /* nothing... */ +#define fd_clear_dma_ff() /* nothing... */ +#define fd_set_dma_mode(mode) sun_fd_set_dma_mode(mode) +#define fd_set_dma_addr(addr) sun_fd_set_dma_addr(addr) +#define fd_set_dma_count(count) sun_fd_set_dma_count(count) +#define fd_enable_irq() /* nothing... */ +#define fd_disable_irq() /* nothing... */ +#define fd_cacheflush(addr, size) /* nothing... */ +#define fd_request_irq() sun_fd_request_irq() +#define fd_free_irq() /* nothing... */ #if 0 /* P3: added by Alain, these cause a MMU corruption. 19960524 XXX */ #define fd_dma_mem_alloc(size) ((unsigned long) vmalloc(size)) #define fd_dma_mem_free(addr,size) (vfree((void *)(addr))) diff --git a/include/asm-sparc/param.h b/include/asm-sparc/param.h index 639675feb..7e14a410e 100644 --- a/include/asm-sparc/param.h +++ b/include/asm-sparc/param.h @@ -4,7 +4,6 @@ #ifndef HZ #define HZ 100 -#define HZ_TO_STD(a) (a) #endif #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h index d6d292f7d..8ac72c3ac 100644 --- a/include/asm-sparc64/floppy.h +++ b/include/asm-sparc64/floppy.h @@ -1,4 +1,4 @@ -/* $Id: floppy.h,v 1.18 1999/03/21 10:51:38 davem Exp $ +/* $Id: floppy.h,v 1.22 1999/08/31 07:02:12 davem Exp $ * asm-sparc64/floppy.h: Sparc specific parts of the Floppy driver. * * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) @@ -71,38 +71,25 @@ struct sun_floppy_ops { static struct sun_floppy_ops sun_fdops; -#define fd_inb(port) sun_fdops.fd_inb(port) -#define fd_outb(value,port) sun_fdops.fd_outb(value,port) - -#define fd_enable_dma(channel) sun_fdops.fd_enable_dma() -#define fd_disable_dma(channel) sun_fdops.fd_disable_dma() -#define fd_request_dma(channel) (0) /* nothing... */ -#define fd_free_dma(channel) /* nothing... */ -#define fd_clear_dma_ff(channel) /* nothing... */ -#define fd_set_dma_mode(channel,mode) sun_fdops.fd_set_dma_mode(mode) -#define fd_set_dma_addr(channel,addr) sun_fdops.fd_set_dma_addr(addr) -#define fd_set_dma_count(channel,count) sun_fdops.fd_set_dma_count(count) -#define get_dma_residue(channel,x) sun_fdops.get_dma_residue() - -#define fd_enable_irq(irq) /* nothing... */ -#define fd_disable_irq(irq) /* nothing... */ -#define fd_request_irq(irq) sun_fd_request_irq() -#define fd_free_irq(irq) /* nothing... */ - -#define fd_eject(drive) sun_fdops.fd_eject(drive) -#if 0 /* P3: added by Alain, these cause a MMU corruption. 19960524 XXX */ -#define fd_dma_mem_alloc(size) ((unsigned long) vmalloc(size)) -#define fd_dma_mem_free(addr,size) (vfree((void *)(addr))) -#endif - -#define FLOPPY_MOTOR_MASK 0x10 - -/* It's all the same... */ -#define virt_to_bus(x) (x) -#define bus_to_virt(x) (x) - -/* XXX This isn't really correct. XXX */ -#define get_dma_residue(x) (0) +#define fd_inb(port) sun_fdops.fd_inb(port) +#define fd_outb(value,port) sun_fdops.fd_outb(value,port) +#define fd_enable_dma() sun_fdops.fd_enable_dma() +#define fd_disable_dma() sun_fdops.fd_disable_dma() +#define fd_request_dma() (0) /* nothing... */ +#define fd_free_dma() /* nothing... */ +#define fd_clear_dma_ff() /* nothing... */ +#define fd_set_dma_mode(mode) sun_fdops.fd_set_dma_mode(mode) +#define fd_set_dma_addr(addr) sun_fdops.fd_set_dma_addr(addr) +#define fd_set_dma_count(count) sun_fdops.fd_set_dma_count(count) +#define get_dma_residue(x) sun_fdops.get_dma_residue() +#define fd_enable_irq() sun_fdops.fd_enable_irq() +#define fd_disable_irq() sun_fdops.fd_disable_irq() +#define fd_cacheflush(addr, size) /* nothing... */ +#define fd_request_irq() sun_fdops.fd_request_irq() +#define fd_free_irq() sun_fdops.fd_free_irq() +#define fd_eject(drive) sun_fdops.fd_eject(drive) + +static int FLOPPY_MOTOR_MASK = 0x10; /* Super paranoid... */ #undef HAVE_DISABLE_HLT diff --git a/include/linux/elf.h b/include/linux/elf.h index a1625640f..3b5742a8f 100644 --- a/include/linux/elf.h +++ b/include/linux/elf.h @@ -20,15 +20,15 @@ typedef __s64 Elf64_Sword; typedef __u64 Elf64_Word; /* These constants are for the segment types stored in the image headers */ -#define PT_NULL 0 -#define PT_LOAD 1 -#define PT_DYNAMIC 2 -#define PT_INTERP 3 -#define PT_NOTE 4 -#define PT_SHLIB 5 -#define PT_PHDR 6 -#define PT_LOPROC 0x70000000 -#define PT_HIPROC 0x7fffffff +#define PT_NULL 0 +#define PT_LOAD 1 +#define PT_DYNAMIC 2 +#define PT_INTERP 3 +#define PT_NOTE 4 +#define PT_SHLIB 5 +#define PT_PHDR 6 +#define PT_LOPROC 0x70000000 +#define PT_HIPROC 0x7fffffff #define PT_MIPS_REGINFO 0x70000000 /* Flags in the e_flags field of the header */ @@ -47,21 +47,28 @@ typedef __u64 Elf64_Word; #define ET_HIPROC 0xffff /* These constants define the various ELF target machines */ -#define EM_NONE 0 -#define EM_M32 1 -#define EM_SPARC 2 -#define EM_386 3 -#define EM_68K 4 -#define EM_88K 5 -#define EM_486 6 /* Perhaps disused */ -#define EM_860 7 -#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ +#define EM_NONE 0 +#define EM_M32 1 +#define EM_SPARC 2 +#define EM_386 3 +#define EM_68K 4 +#define EM_88K 5 +#define EM_486 6 /* Perhaps disused */ +#define EM_860 7 + +#define EM_MIPS 8 /* MIPS R3000 (officially, big-endian only) */ + #define EM_MIPS_RS4_BE 10 /* MIPS R4000 big-endian */ + #define EM_PARISC 15 /* HPPA */ + #define EM_SPARC32PLUS 18 /* Sun's "v8plus" */ + #define EM_PPC 20 /* PowerPC */ -#define EM_SPARCV9 43 /* SPARC v9 64-bit */ +#define EM_SH 42 /* SuperH */ + +#define EM_SPARCV9 43 /* SPARC v9 64-bit */ #define EM_IA_64 50 /* HP/Intel IA-64 */ @@ -73,32 +80,32 @@ typedef __u64 Elf64_Word; /* This is the info that is needed to parse the dynamic section of the file */ -#define DT_NULL 0 -#define DT_NEEDED 1 -#define DT_PLTRELSZ 2 -#define DT_PLTGOT 3 -#define DT_HASH 4 -#define DT_STRTAB 5 -#define DT_SYMTAB 6 -#define DT_RELA 7 -#define DT_RELASZ 8 -#define DT_RELAENT 9 -#define DT_STRSZ 10 -#define DT_SYMENT 11 -#define DT_INIT 12 -#define DT_FINI 13 -#define DT_SONAME 14 -#define DT_RPATH 15 -#define DT_SYMBOLIC 16 -#define DT_REL 17 -#define DT_RELSZ 18 -#define DT_RELENT 19 -#define DT_PLTREL 20 -#define DT_DEBUG 21 -#define DT_TEXTREL 22 -#define DT_JMPREL 23 -#define DT_LOPROC 0x70000000 -#define DT_HIPROC 0x7fffffff +#define DT_NULL 0 +#define DT_NEEDED 1 +#define DT_PLTRELSZ 2 +#define DT_PLTGOT 3 +#define DT_HASH 4 +#define DT_STRTAB 5 +#define DT_SYMTAB 6 +#define DT_RELA 7 +#define DT_RELASZ 8 +#define DT_RELAENT 9 +#define DT_STRSZ 10 +#define DT_SYMENT 11 +#define DT_INIT 12 +#define DT_FINI 13 +#define DT_SONAME 14 +#define DT_RPATH 15 +#define DT_SYMBOLIC 16 +#define DT_REL 17 +#define DT_RELSZ 18 +#define DT_RELENT 19 +#define DT_PLTREL 20 +#define DT_DEBUG 21 +#define DT_TEXTREL 22 +#define DT_JMPREL 23 +#define DT_LOPROC 0x70000000 +#define DT_HIPROC 0x7fffffff #define DT_MIPS_RLD_VERSION 0x70000001 #define DT_MIPS_TIME_STAMP 0x70000002 #define DT_MIPS_ICHECKSUM 0x70000003 @@ -173,18 +180,18 @@ typedef struct { #define ELF32_R_SYM(x) ((x) >> 8) #define ELF32_R_TYPE(x) ((x) & 0xff) -#define R_386_NONE 0 -#define R_386_32 1 -#define R_386_PC32 2 -#define R_386_GOT32 3 -#define R_386_PLT32 4 -#define R_386_COPY 5 -#define R_386_GLOB_DAT 6 -#define R_386_JMP_SLOT 7 -#define R_386_RELATIVE 8 -#define R_386_GOTOFF 9 -#define R_386_GOTPC 10 -#define R_386_NUM 11 +#define R_386_NONE 0 +#define R_386_32 1 +#define R_386_PC32 2 +#define R_386_GOT32 3 +#define R_386_PLT32 4 +#define R_386_COPY 5 +#define R_386_GLOB_DAT 6 +#define R_386_JMP_SLOT 7 +#define R_386_RELATIVE 8 +#define R_386_GOTOFF 9 +#define R_386_GOTPC 10 +#define R_386_NUM 11 #define R_MIPS_NONE 0 #define R_MIPS_16 1 @@ -455,23 +462,23 @@ typedef struct elf64_phdr { } Elf64_Phdr; /* sh_type */ -#define SHT_NULL 0 -#define SHT_PROGBITS 1 -#define SHT_SYMTAB 2 -#define SHT_STRTAB 3 -#define SHT_RELA 4 -#define SHT_HASH 5 -#define SHT_DYNAMIC 6 -#define SHT_NOTE 7 -#define SHT_NOBITS 8 -#define SHT_REL 9 -#define SHT_SHLIB 10 -#define SHT_DYNSYM 11 -#define SHT_NUM 12 -#define SHT_LOPROC 0x70000000 -#define SHT_HIPROC 0x7fffffff -#define SHT_LOUSER 0x80000000 -#define SHT_HIUSER 0xffffffff +#define SHT_NULL 0 +#define SHT_PROGBITS 1 +#define SHT_SYMTAB 2 +#define SHT_STRTAB 3 +#define SHT_RELA 4 +#define SHT_HASH 5 +#define SHT_DYNAMIC 6 +#define SHT_NOTE 7 +#define SHT_NOBITS 8 +#define SHT_REL 9 +#define SHT_SHLIB 10 +#define SHT_DYNSYM 11 +#define SHT_NUM 12 +#define SHT_LOPROC 0x70000000 +#define SHT_HIPROC 0x7fffffff +#define SHT_LOUSER 0x80000000 +#define SHT_HIUSER 0xffffffff #define SHT_MIPS_LIST 0x70000000 #define SHT_MIPS_CONFLICT 0x70000002 #define SHT_MIPS_GPTAB 0x70000003 @@ -485,13 +492,13 @@ typedef struct elf64_phdr { #define SHF_MIPS_GPREL 0x10000000 /* special section indexes */ -#define SHN_UNDEF 0 -#define SHN_LORESERVE 0xff00 -#define SHN_LOPROC 0xff00 -#define SHN_HIPROC 0xff1f -#define SHN_ABS 0xfff1 -#define SHN_COMMON 0xfff2 -#define SHN_HIRESERVE 0xffff +#define SHN_UNDEF 0 +#define SHN_LORESERVE 0xff00 +#define SHN_LOPROC 0xff00 +#define SHN_HIPROC 0xff1f +#define SHN_ABS 0xfff1 +#define SHN_COMMON 0xfff2 +#define SHN_HIRESERVE 0xffff #define SHN_MIPS_ACCOMON 0xff00 typedef struct { |