[MN-dev] [mndiff]: r67 - in trunk/2010: README version_from97.diff
michael
subversion at mplayerhq.hu
Wed Jul 4 14:59:13 CEST 2007
Author: michael
Date: Wed Jul 4 14:59:13 2007
New Revision: 67
Log:
found an older version from 1997
Added:
trunk/2010/version_from97.diff
Modified:
trunk/2010/README
Modified: trunk/2010/README
==============================================================================
--- trunk/2010/README (original)
+++ trunk/2010/README Wed Jul 4 14:59:13 2007
@@ -3,7 +3,7 @@
About:
------
-some old code i wrote in 1998-2000 or so, which decodes nagravision,
+some old code i wrote in 1997-2000 or so, which decodes nagravision,
videocrypt, sync suppression and teletext
warning the code is messy, patches to clean it up are welcome!
@@ -14,6 +14,11 @@ shouldnt be hard (patch welcome)
windows/dos something, i dont remember, patches which port it to linux and
v4l(2) are very welcome
+version_from97.diff
+-------------------
+a diff between the first checkin (r43) and an older version (from 1997) which
+i found too late (svn sucks, i wish we had git on mphq)
+
License:
--------
GPL v2+
\ No newline at end of file
Added: trunk/2010/version_from97.diff
==============================================================================
--- (empty file)
+++ trunk/2010/version_from97.diff Wed Jul 4 14:59:13 2007
@@ -0,0 +1,768 @@
+diff -ud ./2010.cc s_bak/2010.cc
+--- ./2010.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2010.cc 1997-10-02 17:55:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdlib.h>
+ #include <pc.h>
+@@ -124,7 +124,7 @@
+ FILE *f;
+ int mc2;
+
+- printf("2010 0.10 Copyright (C) Michael Niedermayer 1998\n");
++ printf("2010 0.10 Copyright (C) Michael Niedermayer 1997\n");
+
+ atexit(exitt);
+
+@@ -215,7 +215,7 @@
+ edge_lut[i]=j;
+ }
+
+- printf("Building YUV to RGB LookUp Tables!\n");
++ printf("Building YUV to RGB LockUp Tables!\n");
+ yuv2rgb_lut=new char[256*4*2];
+ for(i=0; i<256; i++){
+ if(i>=128) j=i-256;
+@@ -308,6 +308,7 @@
+ while(key==0){
+ draw_dispbuf();
+
++
+ xpos=mouse_x;
+ ypos=mouse_y;
+ buttons=mouse_b;
+@@ -316,7 +317,6 @@
+
+ lxpos=xpos;
+ lypos=ypos;
+-
+ if(kbhit()) key=getkey();
+ if(key=='g' || key=='G') key=0, grabf=1;
+ }
+Only in s_bak/: 2010.cur
+Only in s_bak/: 2010.fnt
+diff -ud ./2010.h s_bak/2010.h
+--- ./2010.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2010.h 1997-08-03 17:50:12.000000000 +0200
+@@ -1,5 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
+-
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2010_h
+ #define n2010_h
+
+Only in s_bak/: 2_7116.cc
+diff -ud ./2_71x6.cc s_bak/2_71x6.cc
+--- ./2_71x6.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_71x6.cc 1997-10-01 20:20:26.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/nearptr.h>
+@@ -10,17 +10,14 @@
+ #include "2_71x6.h"
+ #include "2_hw.h"
+ #include "2_hw_mem.h"
+-#include "2_hw_asm.h"
+ #include "2010.h"
+
+ //#define wait_time 0.002
+-//#define wait_time 0.010
+-#define wait_time 0.020
++#define wait_time 0.010
+
+ extern meteor meteors[8];
+ extern __Go32_Info_Block _go32_info_block;
+ extern u_short my_cs;
+-extern u_short my_ds;
+ extern dword old_intmet_vect_offset;
+ extern word old_intmet_vect_selector;
+ extern byte meteor_handler;
+@@ -101,42 +98,14 @@
+ meteors[active_meteor].saa7116->ints_ctl=(ints_c){
+ stat_even: 1, stat_odd: 1, stat_start: 1, res1: 0,
+ mask_even: 0, mask_odd: 0, mask_start: 0, res2: 0};
+-
+ meteors[active_meteor].saa7116->capt_ctl=(capt_c){
+ cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
+ done_even: 0, done_odd: 0, VRSTN: 0, fifo_en: 0,
+ corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+ res1: 0, corr_dis: 0, range_en: 0, res2: 0};
++ memset((void*)meteors[active_meteor].saa7116, 0, sizeof(saa7116));
+
+- wait(0.02);
+-
+- meteors[active_meteor].saa7116->capt_ctl=(capt_c){
+- cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
+- done_even: 1, done_odd: 1, VRSTN: 1, fifo_en: 1,
+- corr_even: 1, corr_odd: 1, aerr_even: 1, aerr_odd: 1,
+- res1: 0, corr_dis: 0, range_en: 1, res2: 0};
+- meteors[active_meteor].saa7116->capt_ctl=(capt_c){
+- cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
+- done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 1,
+- corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+- res1: 0, corr_dis: 0, range_en: 1, res2: 0};
+- meteors[active_meteor].saa7116->capt_ctl=(capt_c){
+- cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
+- done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 0,
+- corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+- res1: 0, corr_dis: 0, range_en: 1, res2: 0};
+-
+- wait(0.1);
+-
+- meteors[active_meteor].saa7116->capt_ctl=(capt_c){
+- cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
+- done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 1,
+- corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+- res1: 0, corr_dis: 0, range_en: 1, res2: 0};
+-
+- wait(0.05);
+-
+-// memset((void*)meteors[active_meteor].saa7116, 0, sizeof(saa7116));
++ wait(wait_time);
+ }
+
+ static inline int write_i2c(u_char dev, u_char reg, u_char data){
+@@ -187,10 +156,6 @@
+ saa7116 *a_saa7116=(saa7116*)meteors[active_meteor].saa7116;
+ int cap=a_saa7116->capt_ctl_a;
+
+- if(a_saa7116->ints_ctl.stat_even == 0 &
+- a_saa7116->ints_ctl.stat_odd == 0 &
+- a_saa7116->ints_ctl.stat_start == 0 ) asm("int $3\n\t"); // VERY BAD (?? WHO called that int)
+-
+ if((cap & 0x300) != 0){
+ corr_errors++;
+ }
+@@ -204,10 +169,10 @@
+ }
+
+ a_saa7116->capt_ctl_a|=0x0F30;
++
+ if( ( (one_field==0 && nagra_mode==0)
+ || a_saa7116->ints_ctl.stat_even == 0) && fields>=2){
+ fields=0;
+-
+ if(grab_state==Waiting){
+ if(single==1){
+ a_saa7116->capt_ctl=(capt_c){
+@@ -235,6 +200,7 @@
+ }
+ }
+ }
++
+ a_saa7116->ints_ctl_a|=0x7;
+ }
+
+@@ -282,11 +248,10 @@
+ a_saa7116->dma.even[0]= grab_dispbuf.phys;
+ a_saa7116->dma.odd [0]= grab_dispbuf.phys + xresc;
+ }
+-
+ a_saa7116->dma_end.even=
+ a_saa7116->dma_end.odd= grab_dispbuf.phys + xresc*yresst - 1;
+
+-
++
+ }
+
+
+@@ -428,7 +393,7 @@
+ metmode=1;
+
+ address.offset32=(u_long)(&meteor_handler);
+- address.selector=my_cs;
++ address.selector=my_cs;
+ if(__dpmi_set_protected_mode_interrupt_vector(
+ meteors[active_meteor].intt, &address)!=0) error(DPMI);
+
+@@ -439,47 +404,28 @@
+ else outportb(0xA1, inportb(0xA1) & ~(1 << (meteors[active_meteor].irq - 8)));
+ asm("sti\n\t");
+
+- /* init saa7116 */
++ /* init saa7116 and probe for dma-range */
+
+ reset_7116();
+ a_saa7116->capt_ctl=(capt_c){
+ cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
+- done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 0,
++ done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 1,
+ corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+- res1: 0, corr_dis: 0, range_en: 0, res2: 0}; /* end reset / range contr */
++ res1: 0, corr_dis: 0, range_en: 1, res2: 0}; /* end reset / range contr */
+ wait(wait_time);
+-
+- a_saa7116->dma.even[0]= a_saa7116->dma.odd[0]=
+- a_saa7116->dma.even[1]= a_saa7116->dma.odd[1]=
+- a_saa7116->dma.even[2]= a_saa7116->dma.odd[2]= 0;
+- a_saa7116->stride.even[0]= a_saa7116->stride.odd[0]=
+- a_saa7116->stride.even[1]= a_saa7116->stride.odd[1]=
+- a_saa7116->stride.even[2]= a_saa7116->stride.odd[2]= 0;
+-
+- a_saa7116->rt_mode_e= a_saa7116->rt_mode_o=
++ a_saa7116->i2c_clocks=0x461E1E0F;
++ a_saa7116->rt_mode_e=a_saa7116->rt_mode_o=
+ (rt_mode){mode: 0x01, route: 0xEEEEEE}; /* RGB 16 */
+ a_saa7116->fifo_trigger= (ff_trig){packed: 0x20, planar: 0x20}; /* both 20h */
+- a_saa7116->field_toggle= 0x107; /* enab field tog ,reserveds*/
+- a_saa7116->capt_ctl=(capt_c){
+- cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
+- done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 1,
+- corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+- res1: 0, corr_dis: 0, range_en: 0, res2: 0};
+- a_saa7116->retry_wait= 0;
++ //FIX ME perhaps GCC sucks a bit (packed / planar init)
++ a_saa7116->field_toggle= 0x107; /* enab field tog ,etc..*/
+ a_saa7116->ints_ctl=(ints_c){
+ stat_even: 1, stat_odd: 1, stat_start: 1, res1: 0,
+ mask_even: 0, mask_odd: 0, mask_start: 0, res2: 0}; /* disable / clear all ints*/
+ a_saa7116->field_mask=(eo){even: 0x1, odd: 0x1}; /* This and */
+ a_saa7116->mask_lengths= 0; /* that means capture all fields*/
+ a_saa7116->fifo_limits=0x5007C;
+- a_saa7116->i2c_clocks=0x461E1E0F;
+- a_saa7116->i2c_stat_a=0x300;
+- a_saa7116->i2c_cmd_a=0;
+- a_saa7116->i2c_auto.even[0]= a_saa7116->i2c_auto.odd[0]=
+- a_saa7116->i2c_auto.even[1]= a_saa7116->i2c_auto.odd[1]=
+- a_saa7116->i2c_auto.even[2]= a_saa7116->i2c_auto.odd[2]=
+- a_saa7116->i2c_auto.even[3]= a_saa7116->i2c_auto.odd[3]= 0;
+- a_saa7116->i2c_regs_enable= 0;
++ wait(wait_time);
+
+ a_saa7116->dma_end=(eo){even: ~0, odd: ~0};
+ meteors[active_meteor].maxRange=
+@@ -569,6 +515,11 @@
+ void start_grab(void){
+ saa7116 *a_saa7116=(saa7116*)meteors[active_meteor].saa7116;
+
++ a_saa7116->capt_ctl=(capt_c){
++ cont_even: 0, cont_odd: 0, sing_even: 0, sing_odd: 0,
++ done_even: 0, done_odd: 0, VRSTN: 0, fifo_en: 0,
++ corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
++ res1: 0, corr_dis: 0, range_en: 0, res2: 0};
+ a_saa7116->ints_ctl=(ints_c){
+ stat_even: 1, stat_odd: 1, stat_start: 1, res1: 0,
+ mask_even: 0, mask_odd: 0, mask_start: 0, res2: 0};
+@@ -601,8 +552,6 @@
+ a_saa7116->dma_end.even=
+ a_saa7116->dma_end.odd= grab_dispbuf.phys + xresc*yresst - 1;
+
+-
+-
+ wait(wait_time);
+
+ a_saa7116->capt_ctl=(capt_c){
+@@ -613,6 +562,5 @@
+ a_saa7116->ints_ctl=(ints_c){
+ stat_even: 1, stat_odd: 1, stat_start: 1, res1: 0,
+ mask_even: 1, mask_odd: 1, mask_start: 0, res2: 0};
+-
+ }
+
+diff -ud ./2_71x6.h s_bak/2_71x6.h
+--- ./2_71x6.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_71x6.h 1997-09-02 05:09:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_71x6
+ #define n2_71x6
+
+@@ -106,18 +106,10 @@
+ };
+
+ struct i2c_stat {
+- unsigned AutoEnable:1; /* 0:0 AutoEnable */
+- unsigned bypass:1; /* 1:1 bypass */
+- unsigned SDAOut:1; /* 2:2 SDA Output */
+- unsigned SCLOut:1; /* 3:3 SCL Output */
+- unsigned :4; /* 4:7 ? */
+- unsigned AutoAbort:1; /* 8:8 Auto Abort */
+- unsigned d_abort:1; /* 9:9 Status of i2c write: 0==success realy auto abort*/
+- unsigned SDAIn:1; /*10:10 SDA Input */
+- unsigned SCLIn:1; /*11:11 SCL Input */
+- unsigned :4; /*12:15 ? */
+- unsigned AutoAddr:8; /*16:23 Auto Address */
+- unsigned r_data:8; /*24:31 Data returned by i2c read */
++ unsigned :9; /* 0:8 Not needed */
++ unsigned d_abort:1; /* 9:9 Status of i2c write: 0==success */
++ unsigned :14; /* 10:23 Not needed */
++ unsigned r_data:8; /* 24:31 Data returned by i2c read */
+ };
+
+ struct i2c_cmd {
+@@ -129,41 +121,34 @@
+ };
+
+ #define v_struct volatile struct
+-#define v_u_long volatile u_long
+ #define v_union volatile union
+
+ /* (pointer-addition-values)hex-offset(s) */
+ struct saa7116 {
+- v_struct eo3 dma; /* ( 0-5 )00-14: Base address, e/o fields */
+- v_struct eo3 stride; /* ( 6-11)18-2c: Address stride, e/o fields */
+- v_struct rt_mode rt_mode_e; /* (12)30: Route and Mode for even fields */
+- v_struct rt_mode rt_mode_o; /* (13)34: Route and Mode for odd fields */
+- v_struct ff_trig fifo_trigger; /* (14)38 Fifo triggers: Planar and Packed */
+- v_u_long field_toggle; /* (15)3c bit 8=1 1=1 0=1 2=field_toggle */
++ struct eo3 dma; /* ( 0-5 )00-14: Base address, e/o fields */
++ struct eo3 stride; /* ( 6-11)18-2c: Address stride, e/o fields */
++ struct rt_mode rt_mode_e; /* (12)30: Route and Mode for even fields */
++ struct rt_mode rt_mode_o; /* (13)34: Route and Mode for odd fields */
++ struct ff_trig fifo_trigger; /* (14)38 Fifo triggers: Planar and Packed */
++ u_long field_toggle; /* (15)3c bit 8=1 1=1 0=1 2=field_toggle */
+ v_union{
+- v_u_long capt_ctl_a;
++ volatile u_long capt_ctl_a;
+ v_struct capt_c capt_ctl;
+ }; /* (16)40: Capture control, etc. */
+- v_u_long retry_wait; /* (17)44 */
++ u_long retry_wait; /* (17)44 */
+ v_union{
+- v_u_long ints_ctl_a;
++ volatile u_long ints_ctl_a;
+ v_struct ints_c ints_ctl;
+ }; /* (18)48: Interrupt control and status */
+- v_struct eo field_mask; /* (19-20)4c-50 */
+- v_u_long mask_lengths; /* (21)54 */
+- v_u_long fifo_limits; /* (22)58 */
+- v_u_long i2c_clocks; /* (23)5c */
+- v_union{
+- v_u_long i2c_stat_a;
+- v_struct i2c_stat i2c_stat;
+- }; /* (24)60 i2c mode control and status */
+- v_union{
+- v_u_long i2c_cmd_a;
+- v_struct i2c_cmd i2c_cmd;
+- }; /* (25)64 Direct mode command and data */
+- v_struct eo4 i2c_auto; /* (26-33)68-84*/
+- v_u_long i2c_regs_enable; /* (34)88 */
+- v_struct eo dma_end; /* (35-36)8c-90 */
++ struct eo field_mask; /* (19-20)4c-50 */
++ u_long mask_lengths; /* (21)54 */
++ u_long fifo_limits; /* (22)58 */
++ u_long i2c_clocks; /* (23)5c */
++ v_struct i2c_stat i2c_stat; /* (24)60 i2c mode control and status */
++ v_struct i2c_cmd i2c_cmd; /* (25)64 Direct mode command and data */
++ struct eo4 i2c_auto; /* (26-33)68-84*/
++ u_long i2c_regs_enable; /* (34)88 */
++ struct eo dma_end; /* (35-36)8c-90 */
+ };
+
+ #define SAA7196_IDEL 0x00 /* Increment delay */
+diff -ud ./2_all_a.asm s_bak/2_all_a.asm
+--- ./2_all_a.asm 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_all_a.asm 1997-10-03 06:08:38.000000000 +0200
+@@ -1,4 +1,4 @@
+-; 2010 0.1 Copyright (C) Michael Niedermayer 1998
++; 2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ %define par1 (esp + 28)
+ %define par2 (esp + 32)
+diff -ud ./2_all.h s_bak/2_all.h
+--- ./2_all.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_all.h 1997-09-13 19:05:16.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_all_h
+ #define n2_all_h
+
+diff -ud ./2_crypt.cc s_bak/2_crypt.cc
+--- ./2_crypt.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_crypt.cc 1997-10-02 18:53:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <string.h>
+ #include "2_all.h"
+diff -ud ./2_crypt.h s_bak/2_crypt.h
+--- ./2_crypt.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_crypt.h 1997-08-31 22:03:20.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_crypt_h
+ #define n2_crypt_h
+
+diff -ud ./2_file.cc s_bak/2_file.cc
+--- ./2_file.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_file.cc 1997-09-29 03:42:26.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdio.h>
+ #include <dos.h>
+diff -ud ./2_file.h s_bak/2_file.h
+--- ./2_file.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_file.h 1997-07-29 19:22:34.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_file_h
+ #define n2_file_h
+
+diff -ud ./2_gfunc.cc s_bak/2_gfunc.cc
+--- ./2_gfunc.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_gfunc.cc 1997-09-13 19:05:08.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdlib.h>
+ #include <string.h>
+diff -ud ./2_gfunc.h s_bak/2_gfunc.h
+--- ./2_gfunc.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_gfunc.h 1997-07-20 16:10:04.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_gfunc_h
+ #define n2_gfunc_h
+
+diff -ud ./2_glob_a.asm s_bak/2_glob_a.asm
+--- ./2_glob_a.asm 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_glob_a.asm 1997-10-02 23:03:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-;2010 0.1 Copyright (C) Michael Niedermayer 1998
++;2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ %include "2_all_a.asm"
+
+diff -ud ./2_grafix.cc s_bak/2_grafix.cc
+--- ./2_grafix.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_grafix.cc 1997-09-02 05:21:24.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdio.h>
+ #include <time.h>
+@@ -68,7 +68,7 @@
+
+ }
+
+- if(cstate==1) drawc();
++ if(cstate==1) drawc();
+
+ if(istate==1){
+ T2=uclock();
+diff -ud ./2_grafix.h s_bak/2_grafix.h
+--- ./2_grafix.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_grafix.h 1997-07-10 03:35:34.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_grafix_h
+ #define n2_grafix_h
+
+diff -ud ./2_hw_asm.h s_bak/2_hw_asm.h
+--- ./2_hw_asm.h 2007-07-04 11:36:59.000000000 +0200
++++ s_bak/2_hw_asm.h 1997-07-10 03:35:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_hw_asm_h
+ #define n2_hw_asm_h
+
+Only in s_bak/: 2_hw_asm.s
+diff -ud ./2_hw.cc s_bak/2_hw.cc
+--- ./2_hw.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_hw.cc 1997-09-17 05:26:32.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdlib.h>
+ #include <stdio.h> //FIX ME (ONLY TEMP NEEDED)
+@@ -53,7 +53,7 @@
+
+ int g_mode=0;
+ int m_mode=0;
+- extern u_short my_cs, my_ds;
++ u_short my_cs=_go32_my_cs();
+ asm("__esp: .long 0\n\t");
+
+ static inline void setdot(int xx, int yy, s_col c);
+@@ -393,8 +393,6 @@
+ static _go32_dpmi_seginfo mouse_info;
+ __dpmi_paddr address;
+
+- my_cs=_go32_my_cs();
+- my_ds=_go32_my_ds();
+
+ r.x.ax=0;
+ __dpmi_int(0x33, &r); //reset mouse
+@@ -555,8 +553,8 @@
+ fields=0; //FIX ME ? -1 or what
+ meteors[active_meteor].saa7116->capt_ctl=(capt_c){
+ cont_even: 1, cont_odd: 1, sing_even: 0, sing_odd: 0,
+- done_even: 1, done_odd: 1, VRSTN: 1, fifo_en: 1,
+- corr_even: 1, corr_odd: 1, aerr_even: 1, aerr_odd: 1,
++ done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 1,
++ corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+ res1: 0, corr_dis: 0, range_en: 1, res2: 0};
+ // 0x8FF3 resume grab
+ grab_state=NotReady;
+@@ -564,32 +562,13 @@
+ else{
+ meteors[active_meteor].saa7116->capt_ctl=(capt_c){
+ cont_even: 1, cont_odd: 1, sing_even: 0, sing_odd: 0,
+- done_even: 1, done_odd: 1, VRSTN: 1, fifo_en: 1,
+- corr_even: 1, corr_odd: 1, aerr_even: 1, aerr_odd: 1,
++ done_even: 0, done_odd: 0, VRSTN: 1, fifo_en: 1,
++ corr_even: 0, corr_odd: 0, aerr_even: 0, aerr_odd: 0,
+ res1: 0, corr_dis: 0, range_en: 1, res2: 0};
+ // 0x8FF3 resume grab
+ grab_state=Waiting;
+ while(grab_state==Waiting);
+-
+ }
+-/*
+- printf("X\nDMA E0 START %X\n", meteors[active_meteor].saa7116->dma.even[0]);
+- printf("DMA E1 START %X\n", meteors[active_meteor].saa7116->dma.even[1]);
+- printf("DMA E2 START %X\n", meteors[active_meteor].saa7116->dma.even[2]);
+- printf("DMA O0 START %X\n", meteors[active_meteor].saa7116->dma.odd[0]);
+- printf("DMA O1 START %X\n", meteors[active_meteor].saa7116->dma.odd[1]);
+- printf("DMA O2 START %X\n", meteors[active_meteor].saa7116->dma.odd[2]);
+-
+- printf("STRIDE E0 %X\n", meteors[active_meteor].saa7116->stride.even[0]);
+- printf("STRIDE E1 %X\n", meteors[active_meteor].saa7116->stride.even[1]);
+- printf("STRIDE E2 %X\n", meteors[active_meteor].saa7116->stride.even[2]);
+- printf("STRIDE O0 %X\n", meteors[active_meteor].saa7116->stride.odd[0]);
+- printf("STRIDE O1 %X\n", meteors[active_meteor].saa7116->stride.odd[1]);
+- printf("STRIDE O2 %X\n", meteors[active_meteor].saa7116->stride.odd[2]);
+-
+- printf("DMA E END %X\n", meteors[active_meteor].saa7116->dma_end.even);
+- printf("DMA O END %X\n", meteors[active_meteor].saa7116->dma_end.odd);
+- */
+ }
+
+ u_long read_pci(int bus, int dev, int func, int reg, int size){
+diff -ud ./2_hw.h s_bak/2_hw.h
+--- ./2_hw.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_hw.h 1997-09-14 19:53:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_hw_h
+ #define n2_hw_h
+
+diff -ud ./2_hw_mem.cc s_bak/2_hw_mem.cc
+--- ./2_hw_mem.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_hw_mem.cc 1997-09-13 18:57:32.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -283,7 +283,7 @@
+
+ i=~(1024*1024*4-1);
+ if( (maxaddr & i) != ((maxaddr+size) & i) ) error(MemAlloc);
+- //FIX ME (should be retried until ok)
++ //FIX ME (should be retryed until ok)
+ ret.phys=maxaddr;
+ return ret;
+
+diff -ud ./2_hw_mem.h s_bak/2_hw_mem.h
+--- ./2_hw_mem.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_hw_mem.h 1997-07-30 21:41:10.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_hw_mem_h
+ #define n2_hw_mem_h
+
+diff -ud ./2_menu.cc s_bak/2_menu.cc
+--- ./2_menu.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_menu.cc 1997-08-31 21:27:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdlib.h>
+ #include "2_all.h"
+diff -ud ./2_menu.h s_bak/2_menu.h
+--- ./2_menu.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_menu.h 1997-08-31 21:22:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_menu_h
+ #define n2_menu_h
+
+diff -ud ./2_mfunc.cc s_bak/2_mfunc.cc
+--- ./2_mfunc.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_mfunc.cc 1997-09-08 17:21:04.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include "2_all.h"
+ #include "2_mfunc.h"
+diff -ud ./2_mfunc.h s_bak/2_mfunc.h
+--- ./2_mfunc.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_mfunc.h 1997-08-31 21:23:10.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_mfunc_h
+ #define n2_mfunc_h
+
+diff -ud ./2_mmx.h s_bak/2_mmx.h
+--- ./2_mmx.h 2007-07-04 11:36:59.000000000 +0200
++++ s_bak/2_mmx.h 1997-09-15 04:41:14.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_mmx_h
+ #define n2_mmx_h
+
+diff -ud ./2_mouse.cc s_bak/2_mouse.cc
+--- ./2_mouse.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_mouse.cc 1997-08-08 20:57:40.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdlib.h>
+ #include "2_all.h"
+diff -ud ./2_mouse.h s_bak/2_mouse.h
+--- ./2_mouse.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_mouse.h 1997-07-10 03:35:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_mouse_h
+ #define n2_mouse_h
+
+diff -ud ./2_move.cc s_bak/2_move.cc
+--- ./2_move.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_move.cc 1997-09-29 04:40:30.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdlib.h>
+ #include "2_move.h"
+diff -ud ./2_move.h s_bak/2_move.h
+--- ./2_move.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_move.h 1997-08-08 20:58:50.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_move_h
+ #define n2_move_h
+
+diff -ud ./2_nag_a.asm s_bak/2_nag_a.asm
+--- ./2_nag_a.asm 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_nag_a.asm 1997-10-03 06:09:20.000000000 +0200
+@@ -1,4 +1,4 @@
+-;2010 0.1 Copyright (C) Michael Niedermayer 1998
++;2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ %include "2_all_a.asm"
+
+diff -ud ./2_nag_a.h s_bak/2_nag_a.h
+--- ./2_nag_a.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_nag_a.h 1997-09-16 21:54:18.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_nag_a_h
+ #define n2_nag_a_h
+
+diff -ud ./2_nag.cc s_bak/2_nag.cc
+--- ./2_nag.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_nag.cc 1997-10-01 20:58:18.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <string.h>
+ #include <stdlib.h>
+@@ -266,7 +266,7 @@
+ const int line2= line_inf[line1].line[ endlinei[endi] ];
+
+ const int block2= line_inf[line2].block; //FIX THIS (CRASHED)
+- const int endi2= block[block2].end[0] == line2 ? 0 : 1; //FIX THIS CRASHED
++ const int endi2= block[block2].end[0] == line2 ? 0 : 1;
+
+ int backlinei[2]={l_ent, l_ent};
+ for(j=0; j<l_ent; j++){
+diff -ud ./2_nag.h s_bak/2_nag.h
+--- ./2_nag.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_nag.h 1997-09-20 05:40:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_nag_h
+ #define n2_nag_h
+
+diff -ud ./2_vc_a.asm s_bak/2_vc_a.asm
+--- ./2_vc_a.asm 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_vc_a.asm 1997-10-03 06:16:48.000000000 +0200
+@@ -1,4 +1,4 @@
+-;2010 0.1 Copyright (C) Michael Niedermayer 1998
++;2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ %include "2_all_a.asm"
+
+@@ -16,6 +16,7 @@
+ %define count2 par6
+
+ _vc_corr__Fiiiiii:
++ int3
+ push ebx
+
+ push ecx
+diff -ud ./2_vc_a.h s_bak/2_vc_a.h
+--- ./2_vc_a.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_vc_a.h 1997-10-02 22:50:10.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_vc_a_h
+ #define n2_vc_a_h
+
+Only in .: 2_vc.cc
+diff -ud ./2_vc.h s_bak/2_vc.h
+--- ./2_vc.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_vc.h 1997-08-16 18:05:56.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_vc_h
+ #define n2_vc_h
+
+diff -ud ./2_wins.cc s_bak/2_wins.cc
+--- ./2_wins.cc 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_wins.cc 1997-08-09 04:54:14.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+
+ #include <stdio.h>
+ #include <string.h>
+diff -ud ./2_wins.h s_bak/2_wins.h
+--- ./2_wins.h 2007-07-04 14:36:15.000000000 +0200
++++ s_bak/2_wins.h 1997-08-08 21:49:36.000000000 +0200
+@@ -1,4 +1,4 @@
+-//2010 0.1 Copyright (C) Michael Niedermayer 1998
++//2010 0.1 Copyright (C) Michael Niedermayer 1997
+ #ifndef n2_wins_h
+ #define n2_wins_h
+
+Only in .: s_bak
+Only in .: .svn
+Only in .: version_from97.diff
More information about the Mndiff-dev
mailing list