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

Commit b285fab4 authored by Avi Cohen Stuart's avatar Avi Cohen Stuart Committed by Dominik Brodowski
Browse files

pcmcia: correct handling for Zoomed Video registers in topic.h 

Fix handling of Zoomed Video Registers in the Topic pcmcia controller
( http://bugzilla.kernel.org/show_bug.cgi?id=14581

 ). The information
has been retrieved from the Topic manual which can be obtained from
Toshiba.

The Zoomed Video is used with PCMCIA Cards like the Margi DVD-to-Go.

[linux@dominikbrodowski.net: whitespace & commit message fix]

Signed-off-by: default avatarAvi Cohen Stuart <avi.cohenstuart@infor.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent e657ea17

drivers/pcmcia/topic.h

+5 −10
Original line number Diff line number Diff line
@@ -114,22 +114,17 @@ static void topic97_zoom_video(struct pcmcia_socket *sock, int onoff) 
		reg_zv |= TOPIC97_ZV_CONTROL_ENABLE;

		config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv);



		reg = config_readb(socket, TOPIC97_MISC2);

		reg |= TOPIC97_MISC2_ZV_ENABLE;

		config_writeb(socket, TOPIC97_MISC2, reg);



		/* not sure this is needed, doc is unclear */

#if 0

		reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH);

		reg |= TOPIC97_AVS_AUDIO_CONTROL | TOPIC97_AVS_VIDEO_CONTROL;

		config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg);

#endif

	}

	else {

	} else {

		reg_zv &= ~TOPIC97_ZV_CONTROL_ENABLE;

		config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv);

	}



		reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH);

		reg &= ~(TOPIC97_AVS_AUDIO_CONTROL | TOPIC97_AVS_VIDEO_CONTROL);

		config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg);

	}

}



static int topic97_override(struct yenta_socket *socket)