diff options
| author | Warner Losh <imp@FreeBSD.org> | 2005-01-08 22:29:23 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2005-01-08 22:29:23 +0000 |
| commit | 3e4ad73535bc6874b4428829582ef2953a050c63 (patch) | |
| tree | ca42df49c6884601a07817aeaac550903afcfcbb /sys/pc98 | |
| parent | d576b4c79641c4827ccd725b2dc9b85cd14f6b20 (diff) | |
Notes
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/30line.h | 35 | ||||
| -rw-r--r-- | sys/pc98/pc98/30line.h | 35 | ||||
| -rw-r--r-- | sys/pc98/pc98/module.h | 9 |
3 files changed, 10 insertions, 69 deletions
diff --git a/sys/pc98/cbus/30line.h b/sys/pc98/cbus/30line.h index 5f81e69f236a..0c860b958841 100644 --- a/sys/pc98/cbus/30line.h +++ b/sys/pc98/cbus/30line.h @@ -31,32 +31,15 @@ #ifndef __PC98_PC98_30LINE_H__ #define __PC98_PC98_30LINE_H__ -#include <pc98/pc98/module.h> - -#ifndef LINE30_ROW -#define LINE30_ROW 30 -#endif - -#define _CR 80 -#ifndef _VS -#define _VS 2 -#endif -#ifndef _HS +#define LINE30_ROW 30 #define _HS 1 + 1 -#endif -#ifndef _HFP +#define _VS 2 #define _HFP 3 + 1 -#endif -#ifndef _HBP #define _HBP 14 + 1 -#endif -#ifndef _VFP -#define _VFP 11 -#endif -#ifndef _VBP -#define _VBP 44 -#endif +#define _VFP 11 +#define _VBP 44 +#define _CR 80 #define _LF LINE30_ROW*16 #define _GDC_RESET 0x00 @@ -94,28 +77,21 @@ static void master_gdc_cmd(unsigned int); static void master_gdc_prm(unsigned int); static void master_gdc_word_prm(unsigned int); -#ifdef LINE30 static void master_gdc_fifo_empty(void); -#endif static void master_gdc_wait_vsync(void); static void gdc_cmd(unsigned int); -#ifdef LINE30 static void gdc_prm(unsigned int); static void gdc_word_prm(unsigned int); static void gdc_fifo_empty(void); -#endif static void gdc_wait_vsync(void); -#ifdef LINE30 static int check_gdc_clock(void); static int gdc_INFO = _25L; -#endif static int gdc_FH = _24KHZ; static void initialize_gdc(unsigned int, int); -#ifdef LINE30 static unsigned int master_param[2][2][8] = { {{78, 8, 7, 9, 7, 7, 25, 400}, /* 400/24k */ {_CR-2, _VS, _HS-1, _HFP-1, _HBP-1, _VFP, _VBP, _LF}}, /* 480/24k */ @@ -142,6 +118,5 @@ static unsigned int slave_param[2][6][8] = { static int SlavePCH[2] = {40,80}; static int MasterPCH = 80; static int SlaveScrlLF[3] = {400,400,_LF}; -#endif #endif /* __PC98_PC98_30LINE_H__ */ diff --git a/sys/pc98/pc98/30line.h b/sys/pc98/pc98/30line.h index 5f81e69f236a..0c860b958841 100644 --- a/sys/pc98/pc98/30line.h +++ b/sys/pc98/pc98/30line.h @@ -31,32 +31,15 @@ #ifndef __PC98_PC98_30LINE_H__ #define __PC98_PC98_30LINE_H__ -#include <pc98/pc98/module.h> - -#ifndef LINE30_ROW -#define LINE30_ROW 30 -#endif - -#define _CR 80 -#ifndef _VS -#define _VS 2 -#endif -#ifndef _HS +#define LINE30_ROW 30 #define _HS 1 + 1 -#endif -#ifndef _HFP +#define _VS 2 #define _HFP 3 + 1 -#endif -#ifndef _HBP #define _HBP 14 + 1 -#endif -#ifndef _VFP -#define _VFP 11 -#endif -#ifndef _VBP -#define _VBP 44 -#endif +#define _VFP 11 +#define _VBP 44 +#define _CR 80 #define _LF LINE30_ROW*16 #define _GDC_RESET 0x00 @@ -94,28 +77,21 @@ static void master_gdc_cmd(unsigned int); static void master_gdc_prm(unsigned int); static void master_gdc_word_prm(unsigned int); -#ifdef LINE30 static void master_gdc_fifo_empty(void); -#endif static void master_gdc_wait_vsync(void); static void gdc_cmd(unsigned int); -#ifdef LINE30 static void gdc_prm(unsigned int); static void gdc_word_prm(unsigned int); static void gdc_fifo_empty(void); -#endif static void gdc_wait_vsync(void); -#ifdef LINE30 static int check_gdc_clock(void); static int gdc_INFO = _25L; -#endif static int gdc_FH = _24KHZ; static void initialize_gdc(unsigned int, int); -#ifdef LINE30 static unsigned int master_param[2][2][8] = { {{78, 8, 7, 9, 7, 7, 25, 400}, /* 400/24k */ {_CR-2, _VS, _HS-1, _HFP-1, _HBP-1, _VFP, _VBP, _LF}}, /* 480/24k */ @@ -142,6 +118,5 @@ static unsigned int slave_param[2][6][8] = { static int SlavePCH[2] = {40,80}; static int MasterPCH = 80; static int SlaveScrlLF[3] = {400,400,_LF}; -#endif #endif /* __PC98_PC98_30LINE_H__ */ diff --git a/sys/pc98/pc98/module.h b/sys/pc98/pc98/module.h deleted file mode 100644 index b533b3a0fe36..000000000000 --- a/sys/pc98/pc98/module.h +++ /dev/null @@ -1,9 +0,0 @@ -/* $FreeBSD$ */ - -#define LINE30_ROW 30 -#define _HS 1 + 1 -#define _VS 2 -#define _HFP 3 + 1 -#define _HBP 14 + 1 -#define _VFP 11 -#define _VBP 44 |