Merge tag 'tty-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH: "Here is the big set of tty and serial driver patches for 4.17-rc1 Not all that big really, most are just small fixes and additions to existing drivers. There's a bunch of work on the imx serial driver recently for some reason, and a new embedded serial driver added as well. Full details are in the shortlog. All of these have been in the linux-next tree for a while with no reported issues" * tag 'tty-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (66 commits) serial: expose buf_overrun count through proc interface serial: mvebu-uart: fix tx lost characters tty: serial: msm_geni_serial: Fix return value check in qcom_geni_serial_probe() tty: serial: msm_geni_serial: Add serial driver support for GENI based QUP 8250-men-mcb: add support for 16z025 and 16z057 powerpc: Mark the variable earlycon_acpi_spcr_enable maybe_unused serial: stm32: fix initialization of RS485 mode ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards vt: change SGR 21 to follow the standards serdev: Fix typo in serdev_device_alloc ARM: dts: STi: Fix aliases property name for STi boards tty: st-asc: Update tty alias serial: stm32: add support for RS485 hardware control mode dt-bindings: serial: stm32: add RS485 optional properties selftests: add devpts selftests devpts: comment devpts_mntget() devpts: resolve devpts bind-mounts devpts: hoist out check for DEVPTS_SUPER_MAGIC serial: 8250: Add Nuvoton NPCM UART serial: mxs-auart: disable clks of Alphascale ASM9260 ...
This commit is contained in:
@@ -1217,7 +1217,7 @@ font_op_error:
|
||||
/* Interface routine */
|
||||
static int
|
||||
sisusbcon_font_set(struct vc_data *c, struct console_font *font,
|
||||
unsigned flags)
|
||||
unsigned int flags)
|
||||
{
|
||||
struct sisusb_usb_data *sisusb;
|
||||
unsigned charcount = font->charcount;
|
||||
@@ -1338,29 +1338,65 @@ static void sisusbdummycon_init(struct vc_data *vc, int init)
|
||||
vc_resize(vc, 80, 25);
|
||||
}
|
||||
|
||||
static int sisusbdummycon_dummy(void)
|
||||
static void sisusbdummycon_deinit(struct vc_data *vc) { }
|
||||
static void sisusbdummycon_clear(struct vc_data *vc, int sy, int sx,
|
||||
int height, int width) { }
|
||||
static void sisusbdummycon_putc(struct vc_data *vc, int c, int ypos,
|
||||
int xpos) { }
|
||||
static void sisusbdummycon_putcs(struct vc_data *vc, const unsigned short *s,
|
||||
int count, int ypos, int xpos) { }
|
||||
static void sisusbdummycon_cursor(struct vc_data *vc, int mode) { }
|
||||
|
||||
static bool sisusbdummycon_scroll(struct vc_data *vc, unsigned int top,
|
||||
unsigned int bottom, enum con_scroll dir,
|
||||
unsigned int lines)
|
||||
{
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
#define SISUSBCONDUMMY (void *)sisusbdummycon_dummy
|
||||
static int sisusbdummycon_switch(struct vc_data *vc)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sisusbdummycon_blank(struct vc_data *vc, int blank, int mode_switch)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sisusbdummycon_font_set(struct vc_data *vc,
|
||||
struct console_font *font,
|
||||
unsigned int flags)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sisusbdummycon_font_default(struct vc_data *vc,
|
||||
struct console_font *font, char *name)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sisusbdummycon_font_copy(struct vc_data *vc, int con)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct consw sisusb_dummy_con = {
|
||||
.owner = THIS_MODULE,
|
||||
.con_startup = sisusbdummycon_startup,
|
||||
.con_init = sisusbdummycon_init,
|
||||
.con_deinit = SISUSBCONDUMMY,
|
||||
.con_clear = SISUSBCONDUMMY,
|
||||
.con_putc = SISUSBCONDUMMY,
|
||||
.con_putcs = SISUSBCONDUMMY,
|
||||
.con_cursor = SISUSBCONDUMMY,
|
||||
.con_scroll = SISUSBCONDUMMY,
|
||||
.con_switch = SISUSBCONDUMMY,
|
||||
.con_blank = SISUSBCONDUMMY,
|
||||
.con_font_set = SISUSBCONDUMMY,
|
||||
.con_font_get = SISUSBCONDUMMY,
|
||||
.con_font_default = SISUSBCONDUMMY,
|
||||
.con_font_copy = SISUSBCONDUMMY,
|
||||
.con_deinit = sisusbdummycon_deinit,
|
||||
.con_clear = sisusbdummycon_clear,
|
||||
.con_putc = sisusbdummycon_putc,
|
||||
.con_putcs = sisusbdummycon_putcs,
|
||||
.con_cursor = sisusbdummycon_cursor,
|
||||
.con_scroll = sisusbdummycon_scroll,
|
||||
.con_switch = sisusbdummycon_switch,
|
||||
.con_blank = sisusbdummycon_blank,
|
||||
.con_font_set = sisusbdummycon_font_set,
|
||||
.con_font_default = sisusbdummycon_font_default,
|
||||
.con_font_copy = sisusbdummycon_font_copy,
|
||||
};
|
||||
|
||||
int
|
||||
|
مرجع در شماره جدید
Block a user