Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d01b6f0 authored by Samuel Iglesias Gonsalvez's avatar Samuel Iglesias Gonsalvez Committed by Greg Kroah-Hartman
Browse files

ipack/devices/ipoctal: rework disable TX when the TX buffer is empty 



Depending of the device, it disables the TX mode in different places when there
is no more data to transmit.

This patch reorder them and disable the TX mode in the same place.

Signed-off-by: default avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b5071f2c

drivers/ipack/devices/ipoctal.c

+7 −11
Original line number Diff line number Diff line
@@ -177,10 +177,6 @@ static void ipoctal_irq_tx(struct ipoctal_channel *channel) 
	(*pointer_write)++;

	*pointer_write = *pointer_write % PAGE_SIZE;

	channel->nb_bytes--;



	if (channel->nb_bytes == 0 &&

	    channel->board_id != IPACK1_DEVICE_ID_SBS_OCTAL_485)

		iowrite8(CR_DISABLE_TX, &channel->regs->w.cr);

}



static void ipoctal_irq_channel(struct ipoctal_channel *channel)
@@ -196,14 +192,14 @@ static void ipoctal_irq_channel(struct ipoctal_channel *channel) 
	isr = ioread8(&channel->block_regs->r.isr);

	sr = ioread8(&channel->regs->r.sr);



	if ((sr & SR_TX_EMPTY) && (channel->nb_bytes == 0)) {

		iowrite8(CR_DISABLE_TX, &channel->regs->w.cr);

		/* In case of RS-485, change from TX to RX when finishing TX.

		 * Half-duplex. */

	if ((channel->board_id == IPACK1_DEVICE_ID_SBS_OCTAL_485) &&

	    (sr & SR_TX_EMPTY) && (channel->nb_bytes == 0)) {

		iowrite8(CR_DISABLE_TX, &channel->regs->w.cr);

		if (channel->board_id == IPACK1_DEVICE_ID_SBS_OCTAL_485) {

			iowrite8(CR_CMD_NEGATE_RTSN, &channel->regs->w.cr);

			iowrite8(CR_ENABLE_RX, &channel->regs->w.cr);

		iowrite8(CR_DISABLE_TX, &channel->regs->w.cr);

		}

	}



	/* RX data */