Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kf8AF-00011S-Q3 for qemu-devel@nongnu.org; Mon, 15 Sep 2008 03:06:27 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kf8AE-0000zd-BC for qemu-devel@nongnu.org; Mon, 15 Sep 2008 03:06:27 -0400 Received: from [199.232.76.173] (port=37449 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kf8AE-0000zL-5W for qemu-devel@nongnu.org; Mon, 15 Sep 2008 03:06:26 -0400 Received: from mx20.gnu.org ([199.232.41.8]:36571) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Kf8AE-0004c1-3W for qemu-devel@nongnu.org; Mon, 15 Sep 2008 03:06:26 -0400 Received: from hall.aurel32.net ([91.121.138.14]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kf8AC-0004VO-ST for qemu-devel@nongnu.org; Mon, 15 Sep 2008 03:06:25 -0400 Received: from volta.aurel32.net ([2002:52e8:2fb:1:21e:8cff:feb0:693b]) by hall.aurel32.net with esmtpsa (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1Kf8A3-0004r1-Es for qemu-devel@nongnu.org; Mon, 15 Sep 2008 09:06:15 +0200 Received: from aurel32 by volta.aurel32.net with local (Exim 4.69) (envelope-from ) id 1Kf8A2-0004Ly-Mu for qemu-devel@nongnu.org; Mon, 15 Sep 2008 09:06:14 +0200 Date: Mon, 15 Sep 2008 09:06:14 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] [RESEND] SH4 : Serial controller improvement Message-ID: <20080915070614.GB9801@volta.aurel32.net> References: <48C3E662.1010204@juno.dti.ne.jp> <20080914165648.GE22422@volta.aurel32.net> <48CDF5D5.6010506@juno.dti.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <48CDF5D5.6010506@juno.dti.ne.jp> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org On Mon, Sep 15, 2008 at 02:42:45PM +0900, Shin-ichiro KAWASAKI wrote: > Aurelien Jarno wrote: >>> @@ -194,6 +224,15 @@ >>> s->flags |= SH_SERIAL_FLAG_TDE | SH_SERIAL_FLAG_TEND; >>> break; >>> + case 0x14: >>> + if (s->rx_cnt > 0) { >>> + ret = s->rx_fifo[0]; >>> + s->rx_cnt--; >>> + memmove(&s->rx_fifo[0], &s->rx_fifo[1], s->rx_cnt); >> >> I don't think moving the whole buffer each time a character is read is a >> good idea. I would suggest to use a circular buffer instead. Have a look >> at hw/serial.c how it is done. > > I see. I'm sending the patch with a circular buffer. > Thanks for your comments! Thanks, applied. > Regards, > Shin-ichiro KAWASAKI > > > Index: trunk/hw/sh_serial.c > =================================================================== > --- trunk/hw/sh_serial.c (revision 5219) > +++ trunk/hw/sh_serial.c (working copy) > @@ -37,6 +37,8 @@ > #define SH_SERIAL_FLAG_BRK (1 << 3) > #define SH_SERIAL_FLAG_DR (1 << 4) > > +#define SH_RX_FIFO_LENGTH (16) > + > typedef struct { > uint8_t smr; > uint8_t brr; > @@ -46,13 +48,16 @@ > uint16_t fcr; > uint8_t sptr; > > - uint8_t rx_fifo[16]; /* frdr / rdr */ > + uint8_t rx_fifo[SH_RX_FIFO_LENGTH]; /* frdr / rdr */ > uint8_t rx_cnt; > + uint8_t rx_tail; > + uint8_t rx_head; > > target_phys_addr_t base; > int freq; > int feat; > int flags; > + int rtrg; > > CharDriverState *chr; > > @@ -63,6 +68,14 @@ > struct intc_source *bri; > } sh_serial_state; > > +static void sh_serial_clear_fifo(sh_serial_state * s) > +{ > + memset(s->rx_fifo, 0, SH_RX_FIFO_LENGTH); > + s->rx_cnt = 0; > + s->rx_head = 0; > + s->rx_tail = 0; > +} > + > static void sh_serial_ioport_write(void *opaque, uint32_t offs, uint32_t val) > { > sh_serial_state *s = opaque; > @@ -80,6 +93,7 @@ > s->brr = val; > return; > case 0x08: /* SCR */ > + /* TODO : For SH7751, SCIF mask should be 0xfb. */ > s->scr = val & ((s->feat & SH_SERIAL_FEAT_SCIF) ? 0xfa : 0xff); > if (!(val & (1 << 5))) > s->flags |= SH_SERIAL_FLAG_TEND; > @@ -89,6 +103,9 @@ > else if (!(val & (1 << 7)) && s->txi->asserted) > sh_intc_toggle_source(s->txi, 0, -1); > } > + if (!(val & (1 << 6)) && s->rxi->asserted) { > + sh_intc_toggle_source(s->rxi, 0, -1); > + } > return; > case 0x0c: /* FTDR / TDR */ > if (s->chr) { > @@ -117,12 +134,37 @@ > s->flags &= ~SH_SERIAL_FLAG_RDF; > if (!(val & (1 << 0))) > s->flags &= ~SH_SERIAL_FLAG_DR; > + > + if (!(val & (1 << 1)) || !(val & (1 << 0))) { > + if (s->rxi && s->rxi->asserted) { > + sh_intc_toggle_source(s->rxi, 0, -1); > + } > + } > return; > case 0x18: /* FCR */ > s->fcr = val; > + switch ((val >> 6) & 3) { > + case 0: > + s->rtrg = 1; > + break; > + case 1: > + s->rtrg = 4; > + break; > + case 2: > + s->rtrg = 8; > + break; > + case 3: > + s->rtrg = 14; > + break; > + } > + if (val & (1 << 1)) { > + sh_serial_clear_fifo(s); > + s->sr &= ~(1 << 1); > + } > + > return; > case 0x20: /* SPTR */ > - s->sptr = val; > + s->sptr = val & 0xf3; > return; > case 0x24: /* LSR */ > return; > @@ -194,6 +236,16 @@ > s->flags |= SH_SERIAL_FLAG_TDE | SH_SERIAL_FLAG_TEND; > > break; > + case 0x14: > + if (s->rx_cnt > 0) { > + ret = s->rx_fifo[s->rx_tail++]; > + s->rx_cnt--; > + if (s->rx_tail == SH_RX_FIFO_LENGTH) > + s->rx_tail = 0; > + if (s->rx_cnt < s->rtrg) > + s->flags &= ~SH_SERIAL_FLAG_RDF; > + } > + break; > #if 0 > case 0x18: > ret = s->fcr; > @@ -219,6 +271,9 @@ > case 0x10: > ret = 0; > break; > + case 0x14: > + ret = s->rx_fifo[0]; > + break; > case 0x1c: > ret = s->sptr; > break; > @@ -240,15 +295,33 @@ > > static int sh_serial_can_receive(sh_serial_state *s) > { > - return 0; > + return s->scr & (1 << 4); > } > > static void sh_serial_receive_byte(sh_serial_state *s, int ch) > { > + if (s->feat & SH_SERIAL_FEAT_SCIF) { > + if (s->rx_cnt < SH_RX_FIFO_LENGTH) { > + s->rx_fifo[s->rx_head++] = ch; > + if (s->rx_head == SH_RX_FIFO_LENGTH) > + s->rx_head = 0; > + s->rx_cnt++; > + if (s->rx_cnt >= s->rtrg) { > + s->flags |= SH_SERIAL_FLAG_RDF; > + if (s->scr & (1 << 6) && s->rxi) { > + sh_intc_toggle_source(s->rxi, 0, 1); > + } > + } > + } > + } else { > + s->rx_fifo[0] = ch; > + } > } > > static void sh_serial_receive_break(sh_serial_state *s) > { > + if (s->feat & SH_SERIAL_FEAT_SCIF) > + s->sr |= (1 << 4); > } > > static int sh_serial_can_receive1(void *opaque) > @@ -313,6 +386,7 @@ > s->base = base; > s->feat = feat; > s->flags = SH_SERIAL_FLAG_TEND | SH_SERIAL_FLAG_TDE; > + s->rtrg = 1; > > s->smr = 0; > s->brr = 0xff; > @@ -326,7 +400,7 @@ > s->dr = 0xff; > } > > - s->rx_cnt = 0; > + sh_serial_clear_fifo(s); > > s_io_memory = cpu_register_io_memory(0, sh_serial_readfn, > sh_serial_writefn, s); > > > -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net