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
Yoshihiro Takahashi
dc6ea865f7
Move the fdc_alloc_resources function into the bus front end.
2004-07-15 15:00:02 +00:00
Yoshihiro Takahashi
64c232e672
Merged from recent fdc driver changes.
...
Make a separate function to check FDD type.
2004-07-13 13:14:37 +00:00
Yoshihiro Takahashi
61e878c58c
MFi386: revision 1.213.
...
Fix miss merging in previous change.
2004-07-13 12:58:36 +00:00
Poul-Henning Kamp
911dbd84c7
Introduce ttygone() which indicates that the hardware is detached.
...
Move dtrwait logic to the generic TTY level.
2004-07-11 15:18:39 +00:00
Yoshihiro Takahashi
167b6b11dd
MFi386: revision 1.212.
2004-07-11 13:46:10 +00:00
Marcel Moolenaar
6af8e47df7
Update for the KDB framework. Sanitize the alpha console code now that
...
it's in the way even more. Basicly: remove all alpha specific console
support from gfb(4), sio(4) and syscons(4). Rewrite the alpha console
initialization to be identical to all other platforms. In a nutshell:
call cninit().
The platform specific code now only sets or clears RB_SERIAL and thus
automaticly causes the right console to be selected.
sio.c:
o Replace the remote GDB hacks and use the GDB debug port interface
instead.
o Make debugging code conditional upon KDB instead of DDB.
o Call kdb_alt_break() instead of db_alt_break().
o Call kdb_enter() instead of breakpoint().
o Remove the ugly compatibility of using the console as the debug
port.
2004-07-10 22:29:41 +00:00
Yoshihiro Takahashi
d5103548b4
- Merged from sys/dev/fdc/fdc.c revision 1.275.
...
- Break out the cbus front end from fd.c.
- Remove the pccard support because it was broken.
2004-07-08 13:56:17 +00:00
Yoshihiro Takahashi
71ca36da63
MFi386: revision 1.16.
2004-07-08 13:48:49 +00:00
Yoshihiro Takahashi
ccac00d33e
Remove obsolete defines.
2004-07-08 13:47:56 +00:00
Yoshihiro Takahashi
b9d41c7aae
Merged from sys/dev/sio/sio.c revision 1.446.
2004-07-01 09:32:32 +00:00
John Baldwin
3df6c4de7e
- Shorten the names for the TTY related swi interrupt handlers as the
...
'tty:' prefix is largely redundant.
- Fix the priority of the low-priority TTY SWIs that are hung off of the
softclock thread.
Submitted by: bde (2)
2004-06-28 16:17:11 +00:00
Yoshihiro Takahashi
3fdb25139d
Merged from sys/dev/sio/sio.c revision 1.444.
2004-06-28 13:28:20 +00:00
Poul-Henning Kamp
cb9ea5f4cb
Pick the hotchar out of the tty structure instead of caching private
...
copies.
No current line disciplines have a dynamically changing hotchar, and
expecting to receive anything sensible during a change in ldisc is
insane so no locking of the hotchar field is necessary.
2004-06-26 09:20:07 +00:00
Yoshihiro Takahashi
dcfafc520f
Merged from sys/dev/sio/sio.c revision 1.442.
...
(Use generic support for modemcontrol and BREAK ioctls.)
2004-06-26 04:00:46 +00:00
Poul-Henning Kamp
fdf5c3da04
Remove the TIOCDCDTIMESTAMP option.
...
The RFC-2783 PPS-API (<sys/timepps.h>) provides better and more
configurable service.
2004-06-22 20:32:17 +00:00
Yoshihiro Takahashi
2ed7f2ea6d
Merged from sys/dev/sio/sio.c revisions 1.439 and 1.440.
2004-06-22 12:12:10 +00:00
Poul-Henning Kamp
89c9c53da0
Do the dreaded s/dev_t/struct cdev */
...
Bump __FreeBSD_version accordingly.
2004-06-16 09:47:26 +00:00
Warner Losh
28384b60be
Include vm/vm_param.h to pull in KERNBASE now. This should fix the
...
pc98 tinderbox breakage.
2004-06-13 20:17:44 +00:00
Poul-Henning Kamp
1930e303cf
Deorbit COMPAT_SUNOS.
...
We inherited this from the sparc32 port of BSD4.4-Lite1. We have neither
a sparc32 port nor a SunOS4.x compatibility desire these days.
2004-06-11 11:16:26 +00:00
Poul-Henning Kamp
bbc8ceda71
Add missing <sys/module.h> includes.
2004-06-07 06:04:27 +00:00
Poul-Henning Kamp
13e84a71e0
Centralize the line discipline optimization determination in a function
...
called ttyldoptim().
Use this function from all the relevant drivers.
I belive no drivers finger linesw[] directly anymore, paving the way for
locking and refcounting.
2004-06-04 21:55:55 +00:00
Poul-Henning Kamp
fe3ec6224a
Manual edits to change linesw[]-frobbing to ttyld_*() calls.
2004-06-04 20:04:52 +00:00
Poul-Henning Kamp
2140d01b27
Machine generated patch which changes linedisc calls from accessing
...
linesw[] directly to using the ttyld...() functions
The ttyld...() functions ar inline so there is no performance hit.
2004-06-04 16:02:56 +00:00
Poul-Henning Kamp
ba9ee6c533
Add missing <sys/module.h> #includes
2004-06-04 13:04:10 +00:00
Poul-Henning Kamp
e451f9b758
Make the remaining serial drivers call ttyioctl() rather than calling
...
the linedisc directly.
2004-06-04 08:02:37 +00:00
Poul-Henning Kamp
186f2b9e04
Add missing <sys/module.h> includes currently relying on nested include
...
in <sys/kernel.h>
2004-06-03 06:10:02 +00:00
Poul-Henning Kamp
be9bd88238
There is no need to explicitly call the stop function. In all likelyhood
...
->l_close() did it and ttyclose certainly will.
2004-06-01 11:57:15 +00:00
Poul-Henning Kamp
a1cda79464
There is no need to explicitly call ttwakeup() and ttwwakeup() after
...
ttyclose() has been called. It's already been done once by ttyclose,
and probably once by the line-discipline too.
2004-06-01 11:38:06 +00:00
Poul-Henning Kamp
bda4474a59
ttyclose() increments t_gen. Remove redundant increments in drivers.
2004-06-01 10:15:56 +00:00
Yoshihiro Takahashi
a83e8010cc
Merged from sys/dev/fdc/fdc.c revision 1.272.
2004-05-30 13:56:06 +00:00
Yoshihiro Takahashi
413131337a
Mereged from sys/dev/sio/sio.c revision 1.429.
2004-05-06 13:16:45 +00:00
Yoshihiro Takahashi
4496bb391f
- Remove obsolete examples.
...
- Add a comment about meaning of flags.
- Disable unused defines.
2004-05-01 06:53:38 +00:00
Yoshihiro Takahashi
2c7f49d5d5
Merged from sys/dev/sio/sio.c revision 1.428.
2004-05-01 06:46:10 +00:00
Yoshihiro Takahashi
944d807245
Merged from sys/isa/fd.c revision 1.270.
2004-04-25 12:43:44 +00:00
Warner Losh
2fcbca0d85
Remove advertising clause from University of California Regent's
...
license, per letter dated July 22, 1999 and email from Peter Wemm,
Alan Cox and Robert Watson.
Approved by: core, peter, alc, rwatson
2004-04-07 05:00:01 +00:00
Yoshihiro Takahashi
2c08d6bea1
Add a comment about time stamper.
...
Submitted by: chi@bd.mbn.or.jp (Chiharu Shibata)
2004-03-29 12:51:46 +00:00
Yoshihiro Takahashi
279b998b38
- Fix PC98 supports after importing auto selection. [1]
...
- Fix 1.44MB floppy drive probe sequence. [2]
Submitted by: Watanabe Kazuhiro <CQG00620@nifty.ne.jp> [1]
chi@bd.mbn.or.jp (Chiharu Shibata) [2]
2004-03-28 13:40:23 +00:00
Nate Lawson
5f96beb9e0
Convert callers to the new bus_alloc_resource_any(9) API.
...
Submitted by: Mark Santcroos <marks@ripe.net>
Reviewed by: imp, dfr, bde
2004-03-17 17:50:55 +00:00
Warner Losh
91a5625be4
including isa_device.h was historical in this file, remove it
2004-03-15 10:39:01 +00:00
Yoshihiro Takahashi
05f0fb092f
Remove '#include <machine/bus_pio.h>'. This is meaningless.
2004-03-07 05:39:38 +00:00
Poul-Henning Kamp
db42ff97da
Remove unused FDNUMTOUNIT() macro
2004-02-29 10:21:40 +00:00
Yoshihiro Takahashi
6cab36d49d
Merged from sys/isa/fd.c revision 1.266.
2004-02-26 14:59:10 +00:00
Poul-Henning Kamp
dc08ffec87
Device megapatch 4/6:
...
Introduce d_version field in struct cdevsw, this must always be
initialized to D_VERSION.
Flip sense of D_NOGIANT flag to D_NEEDGIANT, this involves removing
four D_NOGIANT flags and adding 145 D_NEEDGIANT flags.
2004-02-21 21:10:55 +00:00
Poul-Henning Kamp
8e1f1df080
Device megapatch 3/6:
...
Add missing D_TTY flags to various drivers.
Complete asserts that dev_t's passed to ttyread(), ttywrite(),
ttypoll() and ttykqwrite() have (d_flags & D_TTY) and a struct tty
pointer.
Make ttyread(), ttywrite(), ttypoll() and ttykqwrite() the default
cdevsw methods for D_TTY drivers and remove the explicit initializations
in various drivers cdevsw structures.
2004-02-21 20:41:11 +00:00
Poul-Henning Kamp
c9c7976f7f
Device megapatch 1/6:
...
Free approx 86 major numbers with a mostly automatically generated patch.
A number of strategic drivers have been left behind by caution, and a few
because they still (ab)use their major number.
2004-02-21 19:42:58 +00:00
Yoshihiro Takahashi
9ce630976e
Merged from sys/dev/sio/sio.c revision 1.418.
2004-01-21 16:12:29 +00:00
Yoshihiro Takahashi
92c531b502
Add detach method.
2003-12-28 12:25:49 +00:00
Bruce Evans
ac0e70c401
Merged from sys/dev/sio/sio.c revision 1.417.
2003-12-26 03:06:11 +00:00
Bruce Evans
f177e8630c
Merged from sys/dev/sio/sio.c revisions 1.415 and 1.416.
...
Approved by: nyan
(Blanket approval for simple changes in sio.)
2003-11-17 23:13:08 +00:00
Yoshihiro Takahashi
6469c6629c
MFi386: revision 1.206
2003-11-04 13:15:12 +00:00