Date: Mon, 28 Jul 2014 14:14:33 +0000 (UTC) From: Aleksandr Rybalko <ray@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269185 - head/sys/dev/vt Message-ID: <201407281414.s6SEEXUM082459@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ray Date: Mon Jul 28 14:14:33 2014 New Revision: 269185 URL: http://svnweb.freebsd.org/changeset/base/269185 Log: Remove unused macro VT_CONSDEV_DECLARE. Join console device now declared in one place. MFC after: 1 week Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/vt/vt.h Modified: head/sys/dev/vt/vt.h ============================================================================== --- head/sys/dev/vt/vt.h Mon Jul 28 13:47:02 2014 (r269184) +++ head/sys/dev/vt/vt.h Mon Jul 28 14:14:33 2014 (r269185) @@ -347,54 +347,6 @@ void vt_upgrade(struct vt_device *vd); #define VT_FB_DEFAULT_HEIGHT 1200 #endif -#define VT_CONSDEV_DECLARE(driver, width, height, softc) \ -static struct terminal driver ## _consterm; \ -static struct vt_window driver ## _conswindow; \ -static struct vt_device driver ## _consdev = { \ - .vd_driver = &driver, \ - .vd_softc = (softc), \ - .vd_flags = VDF_INVALID, \ - .vd_windows = { [VT_CONSWINDOW] = &driver ## _conswindow, }, \ - .vd_curwindow = &driver ## _conswindow, \ - .vd_markedwin = NULL, \ - .vd_kbstate = 0, \ -}; \ -static term_char_t driver ## _constextbuf[(width) * \ - (VBF_DEFAULT_HISTORY_SIZE)]; \ -static term_char_t *driver ## _constextbufrows[ \ - VBF_DEFAULT_HISTORY_SIZE]; \ -static struct vt_window driver ## _conswindow = { \ - .vw_number = VT_CONSWINDOW, \ - .vw_flags = VWF_CONSOLE, \ - .vw_buf = { \ - .vb_buffer = driver ## _constextbuf, \ - .vb_rows = driver ## _constextbufrows, \ - .vb_history_size = VBF_DEFAULT_HISTORY_SIZE, \ - .vb_curroffset = 0, \ - .vb_roffset = 0, \ - .vb_flags = VBF_STATIC, \ - .vb_mark_start = { \ - .tp_row = 0, \ - .tp_col = 0, \ - }, \ - .vb_mark_end = { \ - .tp_row = 0, \ - .tp_col = 0, \ - }, \ - .vb_scr_size = { \ - .tp_row = height, \ - .tp_col = width, \ - }, \ - }, \ - .vw_device = &driver ## _consdev, \ - .vw_terminal = &driver ## _consterm, \ - .vw_kbdmode = K_XLATE, \ -}; \ -TERMINAL_DECLARE_EARLY(driver ## _consterm, vt_termclass, \ - &driver ## _conswindow); \ -SYSINIT(vt_early_cons, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_ANY, \ - vt_upgrade, &driver ## _consdev) - /* name argument is not used yet. */ #define VT_DRIVER_DECLARE(name, drv) DATA_SET(vt_drv_set, drv)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407281414.s6SEEXUM082459>