From: leslie <unknown>
Date: Thu, 10 Jan 2008 18:48:04 +0000 (+0100)
Subject: nagra: fix a signed-unsigned clash
X-Git-Tag: 0.8.7~8
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=ed05b1818028d3dd96da5263305e0c98c5366cd9;p=sasc-ng.git

nagra: fix a signed-unsigned clash
---

diff --git a/systems/nagra/nagra2-0101.c b/systems/nagra/nagra2-0101.c
index 2362a2e..207caaf 100644
--- a/systems/nagra/nagra2-0101.c
+++ b/systems/nagra/nagra2-0101.c
@@ -467,8 +467,8 @@ void cMap0101::DoMap(int f, unsigned char *data, int l)
       break;
     case 0x57:
 #ifdef HAS_AUXSRV
-      cycles=aux.Map(0x57,data,0x60,0x40);
-      if(cycles>0) { cycles-=6; break; }
+      int c=aux.Map(0x57,data,0x60,0x40);
+      if(c>0) { cycles=c-6; break; }
 #endif
       {
       cBN a, b, x, y, scalar;
diff --git a/systems/nagra/nagra2.c b/systems/nagra/nagra2.c
index 0af9867..425da39 100644
--- a/systems/nagra/nagra2.c
+++ b/systems/nagra/nagra2.c
@@ -37,7 +37,7 @@ cN2Timer::cN2Timer(void)
   cycles=0; ctrl=0; divisor=1; remainder=-1; latch=0xFF;
 }
 
-void cN2Timer::AddCycles(int count)
+void cN2Timer::AddCycles(unsigned int count)
 {
   if(Running()) {
     remainder+=count;
diff --git a/systems/nagra/nagra2.h b/systems/nagra/nagra2.h
index 50fa76e..d4de24d 100644
--- a/systems/nagra/nagra2.h
+++ b/systems/nagra/nagra2.h
@@ -59,8 +59,8 @@ private:
   void Stop(void);
 public:
   cN2Timer(void);
-  void AddCycles(int count);
-  unsigned int Cycles(void) { return (unsigned int)cycles; }
+  void AddCycles(unsigned int count);
+  unsigned int Cycles(void) { return cycles; }
   unsigned char Ctrl(void) { return ctrl&tmMASK; }
   void Ctrl(unsigned char c);
   unsigned char Latch(void) { return latch&0xFF; }