From 8292e82b724de425a6a758736cf529d7edff1b96 Mon Sep 17 00:00:00 2001 From: leslie Date: Sat, 16 May 2009 10:56:03 +0800 Subject: [PATCH] nagra: fix some gcc warnings --- systems/nagra/nagra2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/systems/nagra/nagra2.c b/systems/nagra/nagra2.c index 82035fd..bf72da7 100644 --- a/systems/nagra/nagra2.c +++ b/systems/nagra/nagra2.c @@ -273,7 +273,7 @@ bool cN2Emu::Init(int id, int romv) // ROM02 0x02:0x8000-0xbfff if(!AddMapper(new cMapRom(0x8000,buff,0x14000),0x8000,romv>=110?0x8000:0x4000,0x02)) return false; - snprintf(buff,sizeof(buff),"EEP%02X_%d.bin",(id>>8)&0xFF|0x01,romv); + snprintf(buff,sizeof(buff),"EEP%02X_%d.bin",((id>>8)&0xFF)|0x01,romv); // Eeprom00 0x00:0x3000-0x37ff OTP 0x80 //XXX if(!AddMapper(new cMapRom(0x3000,buff,0x0000),0x3000,0x0800,0x00)) return false; if(!AddMapper(new cMapEeprom(0x3000,buff,128,0x0000),0x3000,0x0800,0x00)) return false; @@ -1163,9 +1163,9 @@ bool cSystemNagra2::ProcessECM(const cEcmInfo *ecm, unsigned char *data) else data[5]=0x01; } data[6]&=0x1F; - data[7]=data[7]&0x10|0x86; + data[7]=(data[7]&0x10)|0x86; data[8]=0; - data[9]=data[9]&0x80|0x08; + data[9]=(data[9]&0x80)|0x08; } int cmdLen=data[4]-5; -- 2.39.5