linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
To: bzolnier@gmail.com
Cc: linux-ide@vger.kernel.org
Subject: Re: [PATCH 3/4] ide: call {in|out}put_data() methods from tf_{read|load}() methods
Date: Wed, 18 Mar 2009 21:09:16 +0300	[thread overview]
Message-ID: <49C138CC.7010507@ru.mvista.com> (raw)
In-Reply-To: <200903182043.57246.sshtylyov@ru.mvista.com>

Hello, I wrote:

> Handle IDE_FTFLAG_{IN|OUT}_DATA flags in tf_{read|load}() methods by calling
> {in|out}put_data() methods to transfer 2 bytes -- this will allow us to move
> that handling out of those methods altogether...

> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

    Will have to repost this, sigh...

> Index: linux-2.6/drivers/ide/scc_pata.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/scc_pata.c
> +++ linux-2.6/drivers/ide/scc_pata.c
> @@ -656,9 +656,11 @@ static void scc_tf_load(ide_drive_t *dri
>  	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
>  		HIHI = 0xFF;
>  
> -	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA)
> -		out_be32((void *)io_ports->data_addr,
> -			 (tf->hob_data << 8) | tf->data);
> +	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
> +		u8 data[2] = { tf->data, tf->hob_data };
> +
> +		scc_output_data(drive, NULL, data, 2);
> +	}
>  
>  	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
>  		scc_ide_outb(tf->hob_feature, io_ports->feature_addr);
> @@ -693,10 +695,12 @@ static void scc_tf_read(ide_drive_t *dri
>  	struct ide_taskfile *tf = &cmd->tf;
>  
>  	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
> -		u16 data = (u16)in_be32((void *)io_ports->data_addr);
> +		u8 data[2];
> +
> +		ide_input_data(drive, cmd, data, 2);

    Oops, this should've been scc_input_data(). It's good that I had a glance 
at it after posting... :-<

MBR, Sergei

      reply	other threads:[~2009-03-18 18:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-18 17:43 [PATCH 3/4] ide: call {in|out}put_data() methods from tf_{read|load}() methods Sergei Shtylyov
2009-03-18 18:09 ` Sergei Shtylyov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49C138CC.7010507@ru.mvista.com \
    --to=sshtylyov@ru.mvista.com \
    --cc=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).