nagra-0101: (temp) fix map 23/46 (DVBN)

diff --git a/systems/nagra/nagra2-0101.c b/systems/nagra/nagra2-0101.c
index 11ccec76cd67c936e14dd2e4e3cea090be3df42c..0e1fd008d7dac2c99634a6c20d57aecb12ec3540 100644 (file)
--- a/systems/nagra/nagra2-0101.c
+++ b/systems/nagra/nagra2-0101.c
@@ -212,7 +212,9 @@ bool cMap0101::Map(int f, unsigned char *data, int l)
       break;
     case 0x23:
       AddMapCycles(169);
-      IMonInit0();
+// START FIX
+      IMonInit0(24);
+// END FIX
       break;
     case 0x25:
       AddMapCycles(254);
@@ -355,12 +357,8 @@ bool cMap0101::Map(int f, unsigned char *data, int l)
       }
     case 0x46:
 // START INCOMPLETE FIX
-      IMakeJ();
-      BN_zero(I);
-      BN_set_bit(I,136);
-      BN_mod(B,I,D,ctx);
-      MonMul0(B,B,B,C,D,J,0);
-      MonMul0(B,B,B,C,D,J,0);
+      AddMapCycles(328);
+      IMonInit();
 // END INCOMPLETE FIX
       break;
     case 0x4d:

diff --git a/systems/nagra/nagra2.c b/systems/nagra/nagra2.c
index bf72da797e54fbd0acd46eb56bc02a83a6386b3c..a510fe8ffe3d26cfa1be38e341bdb099a1eebd51 100644 (file)
--- a/systems/nagra/nagra2.c
+++ b/systems/nagra/nagra2.c
@@ -547,7 +547,9 @@ void cMapCore::IMonInit0(int bits)
     BN_set_bit(I,bits ? bits : 68*wordsize);
     BN_zero(B);
     AddMapCycles(141+(wordsize*8+3)/5*5);
-    BN_set_bit(B,64*(wordsize-1));
+    //BN_set_bit(B,64*(wordsize-1));
+    // TEMP or not?
+    BN_set_bit(B,64*(wordsize-1)+bits);
     AddMapCycles(92+72*wordsize);
     BN_mod(B,I,D,ctx);
     AddMapCycles(639);