diff for duplicates of <29495f1d0508172242734e1c99@mail.gmail.com> diff --git a/a/1.txt b/N1/1.txt index ef00ce7..b4c0a4d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,45 +1,42 @@ On 8/8/05, Kumar Gala <galak@freescale.com> wrote: > (A believe Marcelo would like to see this in 2.6.13, but I'll let him > fight over that ;) ->=20 +> > * Makes dpram allocations work > * Makes non-console UART work on both 8xx and 82xx > * Fixed whitespace in files that were touched ->=20 +> > Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com> > Signed-off-by: Pantelis Antoniou <panto@intracom.gr> > Signed-off-by: Kumar Gala <kumar.gala@freescale.com> ->=20 +> > --- > commit 1de80554bcae877dce3b6d878053eb092ef65c72 > tree aba124824607fea1070e86501ddccc9decce362d > parent ad81111fd554c9d3c14c0a50885e076af2f9ac9b -> author Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35:39= - -0500 -> committer Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35= -:39 -0500 +> author Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35:39 -0500 +> committer Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35:39 -0500 <snip> -> diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm= -_uart/cpm_uart_core.c +> diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c > --- a/drivers/serial/cpm_uart/cpm_uart_core.c > +++ b/drivers/serial/cpm_uart/cpm_uart_core.c <snip> > @@ -376,9 +396,19 @@ static int cpm_uart_startup(struct uart_ -> pinfo->sccp->scc_sccm |=3D UART_SCCM_RX; +> pinfo->sccp->scc_sccm |= UART_SCCM_RX; > } ->=20 +> > + if (!(pinfo->flags & FLAG_CONSOLE)) > + cpm_line_cr_cmd(line,CPM_CR_INIT_TRX); > return 0; > } ->=20 +> > +inline void cpm_uart_wait_until_send(struct uart_cpm_port *pinfo) > +{ -> + unsigned long target_jiffies =3D jiffies + pinfo->wait_closing; +> + unsigned long target_jiffies = jiffies + pinfo->wait_closing; > + > + while (!time_after(jiffies, target_jiffies)) > + schedule(); @@ -54,7 +51,7 @@ schedule_timeout({0,1}) instead maybe? > * Shutdown the uart > */ > @@ -394,6 +424,12 @@ static void cpm_uart_shutdown(struct uar ->=20 +> > /* If the port is not the console, disable Rx and Tx. */ > if (!(pinfo->flags & FLAG_CONSOLE)) { > + /* Wait for all the BDs marked sent */ diff --git a/a/content_digest b/N1/content_digest index 2deba3e..7ad4400 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,51 +5,51 @@ "To\0Kumar Gala <galak@freescale.com>\0" "Cc\0Andrew Morton <akpm@osdl.org>" linux-kernel@vger.kernel.org - " linuxppc-embedded <linuxppc-embedded@ozlabs.org>\0" + linuxppc-embedded <linuxppc-embedded@ozlabs.org> + vbordug@ru.mvista.com + panto@intracom.gr + " marcelo.tosatti@cyclades.com\0" "\00:1\0" "b\0" "On 8/8/05, Kumar Gala <galak@freescale.com> wrote:\n" "> (A believe Marcelo would like to see this in 2.6.13, but I'll let him\n" "> fight over that ;)\n" - ">=20\n" + "> \n" "> * Makes dpram allocations work\n" "> * Makes non-console UART work on both 8xx and 82xx\n" "> * Fixed whitespace in files that were touched\n" - ">=20\n" + "> \n" "> Signed-off-by: Vitaly Bordug <vbordug@ru.mvista.com>\n" "> Signed-off-by: Pantelis Antoniou <panto@intracom.gr>\n" "> Signed-off-by: Kumar Gala <kumar.gala@freescale.com>\n" - ">=20\n" + "> \n" "> ---\n" "> commit 1de80554bcae877dce3b6d878053eb092ef65c72\n" "> tree aba124824607fea1070e86501ddccc9decce362d\n" "> parent ad81111fd554c9d3c14c0a50885e076af2f9ac9b\n" - "> author Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35:39=\n" - " -0500\n" - "> committer Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35=\n" - ":39 -0500\n" + "> author Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35:39 -0500\n" + "> committer Kumar K. Gala <kumar.gala@freescale.com> Mon, 08 Aug 2005 22:35:39 -0500\n" "\n" "<snip>\n" "\n" - "> diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm=\n" - "_uart/cpm_uart_core.c\n" + "> diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c\n" "> --- a/drivers/serial/cpm_uart/cpm_uart_core.c\n" "> +++ b/drivers/serial/cpm_uart/cpm_uart_core.c\n" "\n" "<snip>\n" "\n" "> @@ -376,9 +396,19 @@ static int cpm_uart_startup(struct uart_\n" - "> pinfo->sccp->scc_sccm |=3D UART_SCCM_RX;\n" + "> pinfo->sccp->scc_sccm |= UART_SCCM_RX;\n" "> }\n" - ">=20\n" + "> \n" "> + if (!(pinfo->flags & FLAG_CONSOLE))\n" "> + cpm_line_cr_cmd(line,CPM_CR_INIT_TRX);\n" "> return 0;\n" "> }\n" - ">=20\n" + "> \n" "> +inline void cpm_uart_wait_until_send(struct uart_cpm_port *pinfo)\n" "> +{\n" - "> + unsigned long target_jiffies =3D jiffies + pinfo->wait_closing;\n" + "> + unsigned long target_jiffies = jiffies + pinfo->wait_closing;\n" "> +\n" "> + while (!time_after(jiffies, target_jiffies))\n" "> + schedule();\n" @@ -64,7 +64,7 @@ "> * Shutdown the uart\n" "> */\n" "> @@ -394,6 +424,12 @@ static void cpm_uart_shutdown(struct uar\n" - ">=20\n" + "> \n" "> /* If the port is not the console, disable Rx and Tx. */\n" "> if (!(pinfo->flags & FLAG_CONSOLE)) {\n" "> + /* Wait for all the BDs marked sent */\n" @@ -80,4 +80,4 @@ "Thanks,\n" Nish -34c315a899d9a41bbcd16c02c7bd04c3ef311fe5d218fd1437fca1a270ce1df5 +07da3ef2dc20f50436c400594dede852e5a77c17aee34ae803ccd02db2bbc252
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.