From 80a4345c06b8cac72ba3907239646d80fe3791bb Mon Sep 17 00:00:00 2001 From: Paul Fulghum Date: Thu, 31 Aug 2006 21:27:36 -0700 Subject: [PATCH] --- yaml --- r: 33754 b: refs/heads/master c: 202af6d50155f8594ba01d8e0a54d77facc0152a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/synclink_gt.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2f04930d321a..d90ca8f6af2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddac7c7e3a0fe9cfdcef0de24476b8d69f8cf3e7 +refs/heads/master: 202af6d50155f8594ba01d8e0a54d77facc0152a diff --git a/trunk/drivers/char/synclink_gt.c b/trunk/drivers/char/synclink_gt.c index b2dbbdb1bf81..2f07b085536b 100644 --- a/trunk/drivers/char/synclink_gt.c +++ b/trunk/drivers/char/synclink_gt.c @@ -391,8 +391,8 @@ static MGSL_PARAMS default_params = { #define DESC_LIST_SIZE 4096 #define MASK_PARITY BIT1 -#define MASK_FRAMING BIT2 -#define MASK_BREAK BIT3 +#define MASK_FRAMING BIT0 +#define MASK_BREAK BIT14 #define MASK_OVERRUN BIT4 #define GSR 0x00 /* global status */ @@ -1800,17 +1800,17 @@ static void rx_async(struct slgt_info *info) stat = 0; - if ((status = *(p+1) & (BIT9 + BIT8))) { - if (status & BIT9) + if ((status = *(p+1) & (BIT1 + BIT0))) { + if (status & BIT1) icount->parity++; - else if (status & BIT8) + else if (status & BIT0) icount->frame++; /* discard char if tty control flags say so */ if (status & info->ignore_status_mask) continue; - if (status & BIT9) + if (status & BIT1) stat = TTY_PARITY; - else if (status & BIT8) + else if (status & BIT0) stat = TTY_FRAME; } if (tty) {