diff --git a/headers/os/drivers/tty/ttylayer.h b/headers/os/drivers/tty/ttylayer.h deleted file mode 100644 index e5c616f1af..0000000000 --- a/headers/os/drivers/tty/ttylayer.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * BeOS R5 compatible TTY module API - * - * Copyright 2008, Haiku Inc. All Rights Reserved. - * Distributed under the terms of the MIT License. - */ - -#ifndef _TTY_TTYLAYER_H -#define _TTY_TTYLAYER_H - -#include -#include - - -// XXX: should go away or be opacised -struct str { - uchar *buffer; - uint bufsize, count, tail; - bool allocated; -}; - -struct ddrover { - -}; - -struct ddomain { - struct ddrover *r; - bool bg; - bool locked; -}; -#define ddbackground(d) ((d)->bg = true) - - -typedef bool (*tty_service_func)(struct tty *tty, struct ddrover *rover, uint op); - -struct tty { - uint nopen; - uint flags; - struct ddomain dd; - struct ddomain ddi; // used in interrupt context - pid_t pgid; - struct termios t; - uint iactivity; - bool ibusy; - struct str istr; - struct str rstr; - struct str ostr; - struct winsize wsize; - tty_service_func service; - struct sel *sel; - struct tty *ttysel; -}; - -struct ttyfile { - struct tty *tty; - uint flags; - bigtime_t vtime; -}; - -// flags -#define TTYCARRIER (1 << 0) -#define TTYWRITABLE (1 << 1) -#define TTYWRITING (1 << 2) -#define TTYREADING (1 << 3) -#define TTYOSTOPPED (1 << 4) -#define TTYEXCLUSIVE (1 << 5) -#define TTYHWDCD (1 << 6) -#define TTYHWCTS (1 << 7) -#define TTYHWDSR (1 << 8) -#define TTYHWRI (1 << 9) -#define TTYFLOWFORCED (1 << 10) - -// ops -#define TTYENABLE 0 -#define TTYDISABLE 1 -#define TTYSETMODES 2 -#define TTYOSTART 3 -#define TTYOSYNC 4 -#define TTYISTOP 5 -#define TTYIRESUME 6 -#define TTYSETBREAK 7 -#define TTYCLRBREAK 8 -#define TTYSETDTR 9 -#define TTYCLRDTR 10 -#define TTYGETSIGNALS 11 - -typedef struct tty_module_info tty_module_info; - -// this version is compatible with BeOS R5 -struct tty_module_info_r5 { - // not a real bus manager... no rescan() ! - module_info mi; - status_t (*ttyopen)(struct ttyfile *, struct ddrover *, tty_service_func); - status_t (*ttyclose)(struct ttyfile *, struct ddrover *); - status_t (*ttyfree)(struct ttyfile *, struct ddrover *); - status_t (*ttyread)(struct ttyfile *, struct ddrover *, char *, size_t *); - status_t (*ttywrite)(struct ttyfile *, struct ddrover *, const char *, size_t *); - status_t (*ttycontrol)(struct ttyfile *, struct ddrover *, ulong, void *, size_t); - void (*ttyinit)(struct tty *, bool); - void (*ttyilock)(struct tty *, struct ddrover *, bool ); - void (*ttyhwsignal)(struct tty *, struct ddrover *, int, bool); - int (*ttyin)(struct tty *, struct ddrover *, int); - int (*ttyout)(struct tty *, struct ddrover *); - struct ddrover *(*ddrstart)(struct ddrover *); - void (*ddrdone)(struct ddrover *); - void (*ddacquire)(struct ddrover *, struct ddomain *); -}; - -// BeOS R5.1d0 has a different module with the same version... -// we exort this module as version 1.1 to allow using select from drivers -struct tty_module_info_dano { - // not a real bus manager... no rescan() ! - module_info mi; - status_t (*ttyopen)(struct ttyfile *, struct ddrover *, tty_service_func); - status_t (*ttyclose)(struct ttyfile *, struct ddrover *); - status_t (*ttyfree)(struct ttyfile *, struct ddrover *); - status_t (*ttyread)(struct ttyfile *, struct ddrover *, char *, size_t *); - status_t (*ttywrite)(struct ttyfile *, struct ddrover *, const char *, size_t *); - status_t (*ttycontrol)(struct ttyfile *, struct ddrover *, ulong, void *, size_t); - status_t (*ttyselect)(struct ttyfile *, struct ddrover *, uint8, uint32, selectsync *); - status_t (*ttydeselect)(struct ttyfile *, struct ddrover *, uint8, selectsync *); - - void (*ttyinit)(struct tty *, bool); - void (*ttyilock)(struct tty *, struct ddrover *, bool ); - void (*ttyhwsignal)(struct tty *, struct ddrover *, int, bool); - int (*ttyin)(struct tty *, struct ddrover *, int); - int (*ttyout)(struct tty *, struct ddrover *); - struct ddrover *(*ddrstart)(struct ddrover *); - void (*ddrdone)(struct ddrover *); - void (*ddacquire)(struct ddrover *, struct ddomain *); -}; - -#define B_TTY_MODULE_NAME_R5 "bus_managers/tty/v1" -#define B_TTY_MODULE_NAME_DANO "bus_managers/tty/v1.1" - -#define B_TTY_MODULE_NAME B_TTY_MODULE_NAME_DANO -#define tty_module_info tty_module_info_dano - -#endif /* _TTY_TTYLAYER_H */ diff --git a/src/add-ons/kernel/bus_managers/Jamfile b/src/add-ons/kernel/bus_managers/Jamfile index 988ec429bd..1a92efca83 100644 --- a/src/add-ons/kernel/bus_managers/Jamfile +++ b/src/add-ons/kernel/bus_managers/Jamfile @@ -12,6 +12,5 @@ SubInclude HAIKU_TOP src add-ons kernel bus_managers pci ; SubInclude HAIKU_TOP src add-ons kernel bus_managers ps2 ; SubInclude HAIKU_TOP src add-ons kernel bus_managers random ; SubInclude HAIKU_TOP src add-ons kernel bus_managers scsi ; -SubInclude HAIKU_TOP src add-ons kernel bus_managers tty ; SubInclude HAIKU_TOP src add-ons kernel bus_managers usb ; SubInclude HAIKU_TOP src add-ons kernel bus_managers virtio ; diff --git a/src/add-ons/kernel/bus_managers/tty/Jamfile b/src/add-ons/kernel/bus_managers/tty/Jamfile deleted file mode 100644 index 26a8e3fb09..0000000000 --- a/src/add-ons/kernel/bus_managers/tty/Jamfile +++ /dev/null @@ -1,17 +0,0 @@ -SubDir HAIKU_TOP src add-ons kernel bus_managers tty ; - -UsePrivateKernelHeaders ; -UsePrivateHeaders drivers ; -UsePrivateHeaders kernel shared ; -UsePrivateHeaders [ FDirName kernel util ] ; - -KernelAddon tty : - tty.cpp - kernel_cpp.cpp - : - ; - -SEARCH on [ FGristFiles - kernel_cpp.cpp - ] = [ FDirName $(HAIKU_TOP) src system kernel util ] ; - diff --git a/src/add-ons/kernel/bus_managers/tty/tty.cpp b/src/add-ons/kernel/bus_managers/tty/tty.cpp deleted file mode 100644 index 8857121995..0000000000 --- a/src/add-ons/kernel/bus_managers/tty/tty.cpp +++ /dev/null @@ -1,251 +0,0 @@ -/* - * Copyright 2008, François Revol, . - * Copyright 2007-2008, Ingo Weinhold, bonefish@cs.tu-berlin.de. - * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved. - * Distributed under the terms of the MIT License. - */ - - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include - -#include -#include -#include -#include - -#include "tty_private.h" - -//#define TTY_TRACE -#ifdef TTY_TRACE -# define TRACE(x) dprintf x -#else -# define TRACE(x) ; -#endif - - - - -status_t -tty_open(struct ttyfile *, struct ddrover *, tty_service_func) -{ - return B_OK; -} - - -status_t -tty_close(struct ttyfile *, struct ddrover *) -{ - return B_OK; -} - - -status_t -tty_free(struct ttyfile *, struct ddrover *) -{ - return B_OK; -} - - -status_t -tty_read(struct ttyfile *, struct ddrover *, char *, size_t *) -{ - return B_OK; -} - - -status_t -tty_write(struct ttyfile *, struct ddrover *, const char *, size_t *) -{ - return B_OK; -} - - -status_t -tty_control(struct ttyfile *, struct ddrover *, ulong, void *, size_t) -{ - return B_OK; -} - - -status_t -tty_select(struct ttyfile *, struct ddrover *, uint8, uint32, selectsync *) -{ - return B_OK; -} - - -status_t -tty_deselect(struct ttyfile *, struct ddrover *, uint8, selectsync *) -{ - return B_OK; -} - - -void -tty_init(struct tty *, bool) -{ -} - - -void -tty_ilock(struct tty *, struct ddrover *, bool ) -{ -} - - -void -tty_hwsignal(struct tty *, struct ddrover *, int, bool) -{ -} - - -int -tty_in(struct tty *, struct ddrover *, int) -{ - return 0; -} - - -int -tty_out(struct tty *, struct ddrover *) -{ - return 0; -} - - -// #pragma mark ddrover handling - - -struct ddrover * -tty_dd_rstart(struct ddrover *) -{ - return NULL; -} - - -void -tty_dd_rdone(struct ddrover *) -{ -} - -void -tty_dd_acquire(struct ddrover *, struct ddomain *) -{ -} - - -// #pragma mark bus manager exports - - -status_t -tty_module_init(void) -{ - return B_OK; -} - - -void -tty_module_uninit(void) -{ -} - - -static int32 -tty_module_std_ops(int32 op, ...) -{ - switch (op) { - case B_MODULE_INIT: - { - status_t status; - - //TRACE(("TTY: tty_module_init\n")); - - status = tty_module_init(); - if (status < B_OK) - return status; - - return B_OK; - } - - case B_MODULE_UNINIT: - //TRACE(("TTY: tty_module_uninit\n")); - tty_module_uninit(); - return B_OK; - } - - return B_BAD_VALUE; -} - - -static struct tty_module_info_r5 sR5TTYModule = { - // ! this is *NOT* a real bus manager (no rescan call!) - //{ - { - B_TTY_MODULE_NAME, - 0, //B_KEEP_LOADED, - tty_module_std_ops - }, - //NULL - //}, - &tty_open, - &tty_close, - &tty_free, - &tty_read, - &tty_write, - &tty_control, - &tty_init, - &tty_ilock, - &tty_hwsignal, - &tty_in, - &tty_out, - &tty_dd_rstart, - &tty_dd_rdone, - &tty_dd_acquire -}; - -static struct tty_module_info_dano sDanoTTYModule = { - // ! this is *NOT* a real bus manager (no rescan call!) - //{ - { - B_TTY_MODULE_NAME_DANO, - 0, //B_KEEP_LOADED, - tty_module_std_ops - }, - //NULL - //}, - &tty_open, - &tty_close, - &tty_free, - &tty_read, - &tty_write, - &tty_control, - &tty_select, - &tty_deselect, - &tty_init, - &tty_ilock, - &tty_hwsignal, - &tty_in, - &tty_out, - &tty_dd_rstart, - &tty_dd_rdone, - &tty_dd_acquire -}; - -module_info *modules[] = { - (module_info *)&sR5TTYModule, - (module_info *)&sDanoTTYModule, - NULL -}; diff --git a/src/add-ons/kernel/bus_managers/tty/tty_private.h b/src/add-ons/kernel/bus_managers/tty/tty_private.h deleted file mode 100644 index 51334550c4..0000000000 --- a/src/add-ons/kernel/bus_managers/tty/tty_private.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2008, François Revol, . - * Copyright 2007-2008, Ingo Weinhold, bonefish@cs.tu-berlin.de. - * Copyright 2004-2006, Axel Dörfler, axeld@pinc-software.de. All rights reserved. - * Distributed under the terms of the MIT License. - */ -#ifndef _TTY_H_ -#define _TTY_H_ - - - -#endif // _TTY_H_