Commit ac03d3d6 authored by Daniel Ritz's avatar Daniel Ritz Committed by Russell King

[PCMCIA] Add missing ZV parts

the following patch adds the parts missing in 2.6 for ZV support (from 2.4)
against 2.6.0-t5-bk.
parent 7c0564fb
......@@ -1337,7 +1337,7 @@ int pcmcia_get_status(client_handle_t handle, cs_status_t *status)
} else
c = CONFIG(handle);
if ((c != NULL) && (c->state & CONFIG_LOCKED) &&
(c->IntType & INT_MEMORY_AND_IO)) {
(c->IntType & (INT_MEMORY_AND_IO | INT_ZOOMED_VIDEO))) {
u_char reg;
if (c->Present & PRESENT_PIN_REPLACE) {
read_cis_mem(s, 1, (c->ConfigBase+CISREG_PRR)>>1, 1, &reg);
......@@ -1748,6 +1748,8 @@ int pcmcia_request_configuration(client_handle_t handle,
c->Attributes = req->Attributes;
if (req->IntType & INT_MEMORY_AND_IO)
s->socket.flags |= SS_IOCARD;
if (req->IntType & INT_ZOOMED_VIDEO)
s->socket.flags |= SS_ZVCARD | SS_IOCARD;
if (req->Attributes & CONF_ENABLE_DMA)
s->socket.flags |= SS_DMA_MODE;
if (req->Attributes & CONF_ENABLE_SPKR)
......
......@@ -180,6 +180,7 @@ typedef struct config_req_t {
#define INT_MEMORY 0x01
#define INT_MEMORY_AND_IO 0x02
#define INT_CARDBUS 0x04
#define INT_ZOOMED_VIDEO 0x08
/* For RequestIO and ReleaseIO */
typedef struct io_req_t {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment