Return to zv.diff.3.1.24 CVS log

Up to [DVB] / margi2 / zv-diffs

ZV patches by Shigehiro Nomura for Libretto added

Only in tmp/pcmcia-cs-3.1.24/cardmgr: probe
diff -r tmp/pcmcia-cs-3.1.24/include/pcmcia/cs.h pcmcia-cs-3.1.24/include/pcmcia/cs.h
183a184
> #define INT_ZOOMED_VIDEO	0x08
diff -r tmp/pcmcia-cs-3.1.24/include/pcmcia/ss.h pcmcia-cs-3.1.24/include/pcmcia/ss.h
89a90
> #define SS_ZVCARD       0x0400
diff -r tmp/pcmcia-cs-3.1.24/modules/cs.c pcmcia-cs-3.1.24/modules/cs.c
1204,1205c1204,1205
<     if ((c != NULL) && (c->state & CONFIG_LOCKED) &&
< 	(c->IntType & INT_MEMORY_AND_IO)) {
---
>     if ((c != NULL) && (c->state & CONFIG_LOCKED) && (
> 	(c->IntType & INT_MEMORY_AND_IO) || (c->IntType & INT_ZOOMED_VIDEO))) {
1638a1639,1640
>     if (req->IntType & INT_ZOOMED_VIDEO)
> 	s->socket.flags |= SS_ZVCARD;
Binary files tmp/pcmcia-cs-3.1.24/modules/cs.o and pcmcia-cs-3.1.24/modules/cs.o differ
diff -r tmp/pcmcia-cs-3.1.24/modules/i82365.c pcmcia-cs-3.1.24/modules/i82365.c
769a770
>     
2034a2036,2043
>     /* should be somewhere else, but where?? */
>     if (state->flags & SS_ZVCARD) {
>         if (s->flags & IS_RICOH){
> 	    s->state.ricoh.misccon = i365_get(s,RL5C478_MISC_CONTROL);
> 	    s->state.ricoh.misccon |= RL5C478_ZV_ENABLE;
> 	    i365_set(s,RL5C478_MISC_CONTROL,s->state.ricoh.misccon);
> 	}
>     }
Binary files tmp/pcmcia-cs-3.1.24/modules/i82365.o and pcmcia-cs-3.1.24/modules/i82365.o differ
Binary files tmp/pcmcia-cs-3.1.24/modules/pcmcia_core.o and pcmcia-cs-3.1.24/modules/pcmcia_core.o differ
diff -r tmp/pcmcia-cs-3.1.24/modules/ricoh.h pcmcia-cs-3.1.24/modules/ricoh.h
137a138,141
> /* for setting ZV on/off */
> #define RL5C478_MISC_CONTROL            0x2F /* 8 bit */
> #define RL5C478_ZV_ENABLE               0x08
> 
144a149
>     u_char              misccon;        /* RL5C478_MISC_CONTROL */