Ruslan Ermilov
5219ffdbe0
cpp(1) only understand integer arithmetical expressions, so
...
_MACHINE == i386 test always succeeds, even on non-i386 (both
sides of expressions become 0). Remove the comment since
_MACHINE and _MACHINE_ARCH are going away.
2005-12-06 13:22:14 +00:00
Ruslan Ermilov
44e09d2fa2
Fix -Wundef warnings from compiling GENERIC and LINT kernels of
...
all architectures.
2005-12-06 11:19:37 +00:00
Ruslan Ermilov
342ed5d948
Fix -Wundef warnings found when compiling i386 LINT, GENERIC and
...
custom kernels.
2005-12-05 11:58:35 +00:00
Ruslan Ermilov
c9003bc7fa
Catch up with new interrupt handling code.
2005-10-26 06:44:59 +00:00
Poul-Henning Kamp
733634738e
Eliminate two unused arguments to ttycreate().
2005-10-16 20:22:56 +00:00
Yoshihiro Takahashi
ea7d61cd29
Use 'PC Card'
2005-09-30 13:17:54 +00:00
Yoshihiro Takahashi
42244f27c2
Remove EPSON PC-386 note A/W/AE/WR support.
2005-09-14 12:39:06 +00:00
Yoshihiro Takahashi
e3dd1d33b2
Remove EPSON_NRDISK support.
2005-09-13 11:33:25 +00:00
John Baldwin
db015a9153
Fixup some more fallout from the lapic/i8254 changes:
...
- Make sure timer0_max_count is set to a correct value in the lapic case.
- Revert i8254_restore() to explicitly reprogram timer 0 rather than
calling set_timer_freq() to do it. set_timer_freq() only reprograms
the counter if the max count changes which it never does on resume. This
unbreaks suspend/resume for several people.
Tested by: marks, others
Reviewed by: bde
MFC after: 3 days
2005-07-13 15:43:21 +00:00
John Baldwin
623b1a868e
Remove a || 1 that crept into the i8254 commit and was subsequently
...
copied and pasted. I had actually tested without this change in my
trees as had the other testers.
Reported by: bde, Rostislav Krasny rosti dot bsd at gmail dot com
Approved by: re (scottl)
Pointy hat to: jhb
2005-07-05 20:13:12 +00:00
Yoshihiro Takahashi
811d79106f
MFi386: r1.221 (Use a simpler implementation for the i8254 timecounter).
...
Approved by: re (scottl)
2005-07-03 14:19:29 +00:00
Yoshihiro Takahashi
6fd53a4f81
Sync with syscons update (Add new member to struct sc_rndr_sw).
2005-05-29 11:53:14 +00:00
Yoshihiro Takahashi
914ee8ba4b
Fix my copyright.
2005-05-14 10:51:16 +00:00
Yoshihiro Takahashi
b22bf66063
- Move bus dependent defines to {isa,cbus}_dmareg.h.
...
- Use isa/isareg.h rather than <arch>/isa/isa.h.
Tested on: i386, pc98
2005-05-14 10:14:56 +00:00
Yoshihiro Takahashi
24072ca35b
- Move timerreg.h to <arch>/include and split i8253 specific defines into
...
i8253reg.h, and add some defines to control a speaker.
- Move PPI related defines from i386/isa/spkr.c into ppireg.h and use them.
- Move IO_{PPI,TIMER} defines into ppireg.h and timerreg.h respectively.
- Use isa/isareg.h rather than <arch>/isa/isa.h.
Tested on: i386, pc98
2005-05-14 09:10:02 +00:00
Yoshihiro Takahashi
77bcc9ce35
Move the pc98 keymap define into pckbdtables.h because it should be used
...
only on the pckbd driver.
2005-05-12 13:39:31 +00:00
Yoshihiro Takahashi
164e09ddb4
- Move the NPX_DEBUG option to options.{i386,pc98} and use opt_npx.h.
...
- Move npx related defines to {i386,pc98}/include/npx.h to remove #include
{isa,cbus}.h.
2005-05-12 12:47:41 +00:00
Yoshihiro Takahashi
257d63789e
- Move lptreg.h into pc98/cbus and rename to olptreg.h.
...
- Remove ifdef pc98.
2005-05-10 12:30:30 +00:00
Yoshihiro Takahashi
d1725ef7ff
Change a directory layout for pc98.
...
- Move MD files into <arch>/<arch>.
- Move bus dependent files into <arch>/<bus>.
Rename some files to more suitable names.
Repo-copied by: peter
Discussed with: imp
2005-05-10 12:02:18 +00:00
Yoshihiro Takahashi
ce45d2c162
- Remove ifdef PC98.
...
- Reduce diffs from i386.
2005-04-13 13:26:48 +00:00
John Baldwin
fc972f4cc4
Merge from i386:
...
- Add a i8254_pending variable to save some indirections in clkintr().
- Don't bother setting up an IRQ0 handler if we are using the lapic timer.
2005-03-24 21:36:15 +00:00
Warner Losh
8afd8dde0c
Define IRQ_NPX for the irq used for the npx. Define macro for a full
...
reset of of npx, as appropriate for the platform.
2005-03-16 20:44:19 +00:00
Yoshihiro Takahashi
f7fdacf1fa
MFi386: revision 1.217.
2005-03-12 10:30:06 +00:00
John Baldwin
dd1d2889f2
- Remove the BURN_BRIDGES marked support for hooking into the ISA timer 0
...
interrupt.
- Remove the timer_func variable as it now has a static value of
hardclock() and is only used in one place.
Axe borrowed from: phk
2005-03-09 15:33:58 +00:00
Poul-Henning Kamp
e70377df79
Use dynamic major number allocation.
2005-02-27 22:16:30 +00:00
Yoshihiro Takahashi
179c6e9063
Merged from sys/dev/sio/sio.c revision 1.458.
2005-02-11 03:41:34 +00:00
John Baldwin
3b1569715e
Fix pc98 compile: merge in changes to use the local APIC timer. Also, add
...
missing initialization of i8254_intsrc while I am here.
2005-02-09 22:48:22 +00:00
Yoshihiro Takahashi
88d91a5ad0
Remove unused defines.
2005-02-07 12:23:07 +00:00
Poul-Henning Kamp
c81b5b21d3
Add missing isa_dmatc() function.
...
This may or may not be correct, Only the pcii driver would notice and
it doesn't support PC98 yet.
2005-02-07 08:19:53 +00:00
Yoshihiro Takahashi
9f83151765
Merged from sys/dev/sio/sio.c revision 1.457.
2005-02-04 13:35:21 +00:00
Warner Losh
e253961839
In my last commit, I'd assumed that LINE30 was always defined. It
...
turns out that LINE30_ROW was always defined, not LINE30. I confused
this for LINE30 and did the unifdef -DLINE30 using that mistaken
belief. This corrects that problem.
Submitted by: nyan-san
2005-01-09 22:17:39 +00:00
Warner Losh
75a323c107
LINE30 is always defined now, so unifdef -DLINE30 for clarity.
2005-01-08 22:29:53 +00:00
Warner Losh
3e4ad73535
Merge module.h into 30line.h and remove it. It lacked a
...
copyright/license header and was only used by 30line.h. It appears
that the copyright/license in 30line.h covers the old contents
module.h anyway, so this simplifies things a little while cleaning up
one obscure potential license confusion...
Revired by: nyan-san
2005-01-08 22:29:23 +00:00
Warner Losh
60727d8b86
/* -> /*- for license, minor formatting changes
2005-01-07 02:29:27 +00:00
Poul-Henning Kamp
d214c67938
Fix comment.
2004-12-22 17:32:27 +00:00
Yoshihiro Takahashi
437a051986
Add FL_MFM flag to the fd_native_types structure.
...
Submitted by: Watanabe Kazuhiro <CQG00620@nifty.ne.jp>
2004-11-09 14:08:21 +00:00
Poul-Henning Kamp
c2ec6cc809
Use bioq_takefirst()
2004-10-22 08:12:49 +00:00
Yoshihiro Takahashi
9e6b875495
Merged from sys/dev/sio/sio.c (Use generic tty code).
2004-10-15 08:22:37 +00:00
Nate Lawson
3805720c53
Remove unused variable.
2004-10-15 04:59:21 +00:00
Nate Lawson
e5979322ba
Remove local hacks to set flags now that the device probe does this for us.
...
Tested on every device except sio_pci and the pc98 fd.c. Perhaps something
similar should be done for the "disabled" hints also.
MFC after: 2 weeks
2004-10-14 22:21:59 +00:00
Poul-Henning Kamp
9cb9afbd68
Use generic tty code instead of local stuff.
...
NB: device names are now consistent: {cua,tty}d$(port)[.lock,.init]
2004-10-13 08:27:20 +00:00
Yoshihiro Takahashi
725991af20
Add more PnP serial cards support.
...
PR: kern/72226
Submitted by: Hirokazu WATANABE <wnabe@par.odn.ne.jp>
2004-10-01 15:58:54 +00:00
Yoshihiro Takahashi
e48b233cd8
Merged from sys/dev/sio/sio.c: more tty related changes.
2004-09-20 14:01:38 +00:00
Poul-Henning Kamp
b6fa152c44
Use tty->t_sc, ttyalloc() and lock/init termios from struct tty.
2004-09-17 10:59:17 +00:00
Poul-Henning Kamp
ead167465e
Include <sys/malloc.h> to satisfy new isa_dma stuff.
2004-09-17 10:55:01 +00:00
Poul-Henning Kamp
7ce1979be6
Add new a function isa_dma_init() which returns an errno when it fails
...
and which takes a M_WAITOK/M_NOWAIT flag argument.
Add compatibility isa_dmainit() macro which whines loudly if
isa_dma_init() fails.
Problem uncovered by: tegge
2004-09-15 12:09:50 +00:00
Yoshihiro Takahashi
6d0e236ade
Merged from sys/dev/fdc/fdc.c revision 1.283.
2004-08-22 15:10:53 +00:00
Yoshihiro Takahashi
04fc672ad6
Merged from sys/dev/sio/sio.c revision 1.450.
2004-07-24 15:13:42 +00:00
Yoshihiro Takahashi
b13793039c
Merged from the following changes.
...
- sys/dev/fdc/fdc.c revision 1.281
- sys/dev/fdc/fdcvar.h revision 1.3
- sys/dev/fdc/fdc_isa.c revision 1.7
2004-07-17 10:07:19 +00:00
Poul-Henning Kamp
672c05d49c
Preparation commit for the tty cleanups that will follow in the near
...
future:
rename ttyopen() -> tty_open() and ttyclose() -> tty_close().
We need the ttyopen() and ttyclose() for the new generic cdevsw
functions for tty devices in order to have consistent naming.
2004-07-15 20:47:41 +00:00