mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
Fixed devfs initialization which I broke in the previous commit.
Fixed an old name and disorder in the sio dictionary.
This commit is contained in:
Bruce Evans
parent
9a02ad618f
commit
4a74956bf7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=38445
@ -27,7 +27,7 @@
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: cy.c,v 1.68 1998/08/13 19:03:22 bde Exp $
|
||||
* $Id: cy.c,v 1.69 1998/08/19 04:17:38 bde Exp $
|
||||
*/
|
||||
|
||||
#include "opt_compat.h"
|
||||
@ -120,7 +120,6 @@
|
||||
#define comhardclose cyhardclose
|
||||
#define commctl cymctl
|
||||
#define comparam cyparam
|
||||
#define siopoll_registered cypoll_registered
|
||||
#define comspeed cyspeed
|
||||
#define comstart cystart
|
||||
#define comwakeup cywakeup
|
||||
@ -131,9 +130,9 @@
|
||||
#define siodevtotty cydevtotty
|
||||
#define siodriver cydriver
|
||||
#define siodtrwakeup cydtrwakeup
|
||||
#define sioioctl cyioctl
|
||||
#define siointr cyintr
|
||||
#define siointr1 cyintr1
|
||||
#define sioioctl cyioctl
|
||||
#define sioopen cyopen
|
||||
#define siopoll cypoll
|
||||
#define sioprobe cyprobe
|
||||
@ -141,9 +140,10 @@
|
||||
#define siosettimeout cysettimeout
|
||||
#define siostop cystop
|
||||
#define siowrite cywrite
|
||||
#define sio_registered cy_registered
|
||||
#define sio_timeout cy_timeout
|
||||
#define sio_timeouts_until_log cy_timeouts_until_log
|
||||
#define sio_timeout_handle cy_timeout_handle
|
||||
#define sio_timeouts_until_log cy_timeouts_until_log
|
||||
#define sio_tty cy_tty
|
||||
|
||||
#define CY_MAX_PORTS (CD1400_NO_OF_CHANNELS * CY_MAX_CD1400s)
|
||||
@ -603,6 +603,12 @@ cyattach_common(cy_iobase, cy_align)
|
||||
com_addr(unit) = com;
|
||||
splx(s);
|
||||
|
||||
if (!sio_registered) {
|
||||
dev = makedev(CDEV_MAJOR, 0);
|
||||
cdevsw_add(&dev, &sio_cdevsw, NULL);
|
||||
register_swi(SWI_TTY, siopoll);
|
||||
sio_registered = TRUE;
|
||||
}
|
||||
#ifdef DEVFS
|
||||
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
|
||||
unit, DV_CHR,
|
||||
@ -631,12 +637,6 @@ cyattach_common(cy_iobase, cy_align)
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (!sio_registered) {
|
||||
dev = makedev(CDEV_MAJOR, 0);
|
||||
cdevsw_add(&dev, &sio_cdevsw, NULL);
|
||||
register_swi(SWI_TTY, siopoll);
|
||||
sio_registered = TRUE;
|
||||
}
|
||||
|
||||
/* ensure an edge for the next interrupt */
|
||||
cd_outb(cy_iobase, CY_CLEAR_INTR, cy_align, 0);
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: cy.c,v 1.68 1998/08/13 19:03:22 bde Exp $
|
||||
* $Id: cy.c,v 1.69 1998/08/19 04:17:38 bde Exp $
|
||||
*/
|
||||
|
||||
#include "opt_compat.h"
|
||||
@ -120,7 +120,6 @@
|
||||
#define comhardclose cyhardclose
|
||||
#define commctl cymctl
|
||||
#define comparam cyparam
|
||||
#define siopoll_registered cypoll_registered
|
||||
#define comspeed cyspeed
|
||||
#define comstart cystart
|
||||
#define comwakeup cywakeup
|
||||
@ -131,9 +130,9 @@
|
||||
#define siodevtotty cydevtotty
|
||||
#define siodriver cydriver
|
||||
#define siodtrwakeup cydtrwakeup
|
||||
#define sioioctl cyioctl
|
||||
#define siointr cyintr
|
||||
#define siointr1 cyintr1
|
||||
#define sioioctl cyioctl
|
||||
#define sioopen cyopen
|
||||
#define siopoll cypoll
|
||||
#define sioprobe cyprobe
|
||||
@ -141,9 +140,10 @@
|
||||
#define siosettimeout cysettimeout
|
||||
#define siostop cystop
|
||||
#define siowrite cywrite
|
||||
#define sio_registered cy_registered
|
||||
#define sio_timeout cy_timeout
|
||||
#define sio_timeouts_until_log cy_timeouts_until_log
|
||||
#define sio_timeout_handle cy_timeout_handle
|
||||
#define sio_timeouts_until_log cy_timeouts_until_log
|
||||
#define sio_tty cy_tty
|
||||
|
||||
#define CY_MAX_PORTS (CD1400_NO_OF_CHANNELS * CY_MAX_CD1400s)
|
||||
@ -603,6 +603,12 @@ cyattach_common(cy_iobase, cy_align)
|
||||
com_addr(unit) = com;
|
||||
splx(s);
|
||||
|
||||
if (!sio_registered) {
|
||||
dev = makedev(CDEV_MAJOR, 0);
|
||||
cdevsw_add(&dev, &sio_cdevsw, NULL);
|
||||
register_swi(SWI_TTY, siopoll);
|
||||
sio_registered = TRUE;
|
||||
}
|
||||
#ifdef DEVFS
|
||||
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
|
||||
unit, DV_CHR,
|
||||
@ -631,12 +637,6 @@ cyattach_common(cy_iobase, cy_align)
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (!sio_registered) {
|
||||
dev = makedev(CDEV_MAJOR, 0);
|
||||
cdevsw_add(&dev, &sio_cdevsw, NULL);
|
||||
register_swi(SWI_TTY, siopoll);
|
||||
sio_registered = TRUE;
|
||||
}
|
||||
|
||||
/* ensure an edge for the next interrupt */
|
||||
cd_outb(cy_iobase, CY_CLEAR_INTR, cy_align, 0);
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: cy.c,v 1.68 1998/08/13 19:03:22 bde Exp $
|
||||
* $Id: cy.c,v 1.69 1998/08/19 04:17:38 bde Exp $
|
||||
*/
|
||||
|
||||
#include "opt_compat.h"
|
||||
@ -120,7 +120,6 @@
|
||||
#define comhardclose cyhardclose
|
||||
#define commctl cymctl
|
||||
#define comparam cyparam
|
||||
#define siopoll_registered cypoll_registered
|
||||
#define comspeed cyspeed
|
||||
#define comstart cystart
|
||||
#define comwakeup cywakeup
|
||||
@ -131,9 +130,9 @@
|
||||
#define siodevtotty cydevtotty
|
||||
#define siodriver cydriver
|
||||
#define siodtrwakeup cydtrwakeup
|
||||
#define sioioctl cyioctl
|
||||
#define siointr cyintr
|
||||
#define siointr1 cyintr1
|
||||
#define sioioctl cyioctl
|
||||
#define sioopen cyopen
|
||||
#define siopoll cypoll
|
||||
#define sioprobe cyprobe
|
||||
@ -141,9 +140,10 @@
|
||||
#define siosettimeout cysettimeout
|
||||
#define siostop cystop
|
||||
#define siowrite cywrite
|
||||
#define sio_registered cy_registered
|
||||
#define sio_timeout cy_timeout
|
||||
#define sio_timeouts_until_log cy_timeouts_until_log
|
||||
#define sio_timeout_handle cy_timeout_handle
|
||||
#define sio_timeouts_until_log cy_timeouts_until_log
|
||||
#define sio_tty cy_tty
|
||||
|
||||
#define CY_MAX_PORTS (CD1400_NO_OF_CHANNELS * CY_MAX_CD1400s)
|
||||
@ -603,6 +603,12 @@ cyattach_common(cy_iobase, cy_align)
|
||||
com_addr(unit) = com;
|
||||
splx(s);
|
||||
|
||||
if (!sio_registered) {
|
||||
dev = makedev(CDEV_MAJOR, 0);
|
||||
cdevsw_add(&dev, &sio_cdevsw, NULL);
|
||||
register_swi(SWI_TTY, siopoll);
|
||||
sio_registered = TRUE;
|
||||
}
|
||||
#ifdef DEVFS
|
||||
com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw,
|
||||
unit, DV_CHR,
|
||||
@ -631,12 +637,6 @@ cyattach_common(cy_iobase, cy_align)
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if (!sio_registered) {
|
||||
dev = makedev(CDEV_MAJOR, 0);
|
||||
cdevsw_add(&dev, &sio_cdevsw, NULL);
|
||||
register_swi(SWI_TTY, siopoll);
|
||||
sio_registered = TRUE;
|
||||
}
|
||||
|
||||
/* ensure an edge for the next interrupt */
|
||||
cd_outb(cy_iobase, CY_CLEAR_INTR, cy_align, 0);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user