Download raw body.
remove some x86 isa_machdep.h cruft
> Date: Sun, 12 May 2024 20:05:10 +1000
> From: Jonathan Gray <jsg@jsg.id.au>
>
> isaphysmem and isaphysmempgs were removed in 1998
ok kettenis@
> Index: sys/arch/i386/isa/isa_machdep.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/i386/isa/isa_machdep.h,v
> diff -u -p -r1.25 isa_machdep.h
> --- sys/arch/i386/isa/isa_machdep.h 22 Aug 2009 02:54:50 -0000 1.25
> +++ sys/arch/i386/isa/isa_machdep.h 12 May 2024 09:57:30 -0000
> @@ -139,58 +139,6 @@ struct isa_dma_cookie {
> #define ID_IS_BOUNCING 0x04 /* map is bouncing current xfer */
>
> /*
> - * XXX Various seemingly PC-specific constants, some of which may be
> - * unnecessary anyway.
> - */
> -
> -/*
> - * RAM Physical Address Space (ignoring the above mentioned "hole")
> - */
> -#define RAM_BEGIN 0x0000000 /* Start of RAM Memory */
> -#define RAM_END 0x1000000 /* End of RAM Memory */
> -#define RAM_SIZE (RAM_END - RAM_BEGIN)
> -
> -/*
> - * Oddball Physical Memory Addresses
> - */
> -#define COMPAQ_RAMRELOC 0x80c00000 /* Compaq RAM relocation/diag */
> -#define COMPAQ_RAMSETUP 0x80c00002 /* Compaq RAM setup */
> -#define WEITEK_FPU 0xC0000000 /* WTL 2167 */
> -#define CYRIX_EMC 0xC0000000 /* Cyrix EMC */
> -
> -/*
> - * stuff that used to be in pccons.c
> - */
> -#define MONO_BUF 0xB0000
> -#define CGA_BUF 0xB8000
> -#define IOPHYSMEM 0xA0000
> -
> -
> -/*
> - * ISA DMA bounce buffers.
> - * XXX should be made partially machine- and bus-mapping-independent.
> - *
> - * DMA_BOUNCE is the number of pages of low-addressed physical memory
> - * to acquire for ISA bounce buffers. If physical memory below 16 MB
> - * then DMA_BOUNCE_LOW will be used.
> - *
> - * isaphysmem is the address of this physical contiguous low memory.
> - * isaphysmempgs is the number of pages allocated.
> - */
> -
> -#ifndef DMA_BOUNCE
> -#define DMA_BOUNCE 48 /* number of pages if memory > 16M */
> -#endif
> -
> -#ifndef DMA_BOUNCE_LOW
> -#define DMA_BOUNCE_LOW 16 /* number of pages if memory <= 16M */
> -#endif
> -
> -extern vaddr_t isaphysmem;
> -extern int isaphysmempgs;
> -
> -
> -/*
> * Variables and macros to deal with the ISA I/O hole.
> * XXX These should be converted to machine- and bus-mapping-independent
> * function definitions, invoked through the softc.
> Index: sys/arch/amd64/include/isa_machdep.h
> ===================================================================
> RCS file: /cvs/src/sys/arch/amd64/include/isa_machdep.h,v
> diff -u -p -r1.9 isa_machdep.h
> --- sys/arch/amd64/include/isa_machdep.h 11 Dec 2008 17:07:14 -0000 1.9
> +++ sys/arch/amd64/include/isa_machdep.h 12 May 2024 09:59:20 -0000
> @@ -149,36 +149,6 @@ struct isa_dma_cookie {
> #define ID_HAS_BOUNCE 0x02 /* map currently has bounce buffers */
> #define ID_IS_BOUNCING 0x04 /* map is bouncing current xfer */
>
> -
> -
> -/*
> - * XXX Various seemingly PC-specific constants, some of which may be
> - * unnecessary anyway.
> - */
> -
> -/*
> - * RAM Physical Address Space (ignoring the above mentioned "hole")
> - */
> -#define RAM_BEGIN 0x0000000 /* Start of RAM Memory */
> -#define RAM_END 0x1000000 /* End of RAM Memory */
> -#define RAM_SIZE (RAM_END - RAM_BEGIN)
> -
> -/*
> - * Oddball Physical Memory Addresses
> - */
> -#define COMPAQ_RAMRELOC 0x80c00000 /* Compaq RAM relocation/diag */
> -#define COMPAQ_RAMSETUP 0x80c00002 /* Compaq RAM setup */
> -#define WEITEK_FPU 0xC0000000 /* WTL 2167 */
> -#define CYRIX_EMC 0xC0000000 /* Cyrix EMC */
> -
> -/*
> - * stuff that used to be in pccons.c
> - */
> -#define MONO_BASE 0x3B4
> -#define MONO_BUF 0xB0000
> -#define CGA_BASE 0x3D4
> -#define CGA_BUF 0xB8000
> -
> /*
> * Variables and macros to deal with the ISA I/O hole.
> * XXX These should be converted to machine- and bus-mapping-independent
>
>
remove some x86 isa_machdep.h cruft