w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix up some compiler errors when using gfortran v9

This commit is contained in:
Bill Somerville 2019-02-10 20:43:51 +00:00
parent 4dfc4685e9
commit 7d66f442d6
5 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/ft8/chkcrc13a.f90
View File

@ -1,24 +1,24 @@
subroutine chkcrc13a(decoded,nbadcrc) subroutine chkcrc13a(decoded,nbadcrc)
use crc use crc
integer*1 decoded(90) integer*1 decoded(90)
integer*1, target:: i1Dec8BitBytes(12) integer*1, target:: i1Dec8BitBytes(12)
character*90 cbits character*90 cbits
! Write decoded bits into cbits: 77-bit message plus 13-bit CRC ! Write decoded bits into cbits: 77-bit message plus 13-bit CRC
write(cbits,1000) decoded write(cbits,1000) decoded
1000 format(90i1) 1000 format(90i1)
read(cbits,1001) i1Dec8BitBytes read(cbits,1001) i1Dec8BitBytes
1001 format(12b8) 1001 format(12b8)
read(cbits,1002) ncrc13 !Received CRC13 read(cbits,1002) ncrc13 !Received CRC13
1002 format(77x,b13) 1002 format(77x,b13)
i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32+16+8) i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),transfer(128+64+32+16+8,0_1))
i1Dec8BitBytes(11:12)=0 i1Dec8BitBytes(11:12)=0
icrc13=crc13(c_loc(i1Dec8BitBytes),12) !CRC13 computed from 77 msg bits icrc13=crc13(c_loc(i1Dec8BitBytes),12) !CRC13 computed from 77 msg bits
nbadcrc=1 nbadcrc=1
if(ncrc13.eq.icrc13) nbadcrc=0 if(ncrc13.eq.icrc13) nbadcrc=0
return return
end subroutine chkcrc13a end subroutine chkcrc13a

48
lib/ft8/chkcrc14a.f90
View File

@ -1,24 +1,24 @@
subroutine chkcrc14a(decoded,nbadcrc) subroutine chkcrc14a(decoded,nbadcrc)
use crc use crc
integer*1 decoded(91) integer*1 decoded(91)
integer*1, target:: i1Dec8BitBytes(12) integer*1, target:: i1Dec8BitBytes(12)
character*91 cbits character*91 cbits
! Write decoded bits into cbits: 77-bit message plus 14-bit CRC ! Write decoded bits into cbits: 77-bit message plus 14-bit CRC
write(cbits,1000) decoded write(cbits,1000) decoded
1000 format(91i1) 1000 format(91i1)
read(cbits,1001) i1Dec8BitBytes read(cbits,1001) i1Dec8BitBytes
1001 format(12b8) 1001 format(12b8)
read(cbits,1002) ncrc14 !Received CRC14 read(cbits,1002) ncrc14 !Received CRC14
1002 format(77x,b14) 1002 format(77x,b14)
i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32+16+8) i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),transfer(128+64+32+16+8,0_1))
i1Dec8BitBytes(11:12)=0 i1Dec8BitBytes(11:12)=0
icrc14=crc14(c_loc(i1Dec8BitBytes),12) !CRC14 computed from 77 msg bits icrc14=crc14(c_loc(i1Dec8BitBytes),12) !CRC14 computed from 77 msg bits
nbadcrc=1 nbadcrc=1
if(ncrc14.eq.icrc14) nbadcrc=0 if(ncrc14.eq.icrc14) nbadcrc=0
return return
end subroutine chkcrc14a end subroutine chkcrc14a

4
lib/ft8/extractmessage174.f90
View File

@ -17,7 +17,7 @@ subroutine extractmessage174(decoded,msgreceived,ncrcflag)
read(cbits,1002) ncrc12 !Received CRC12 read(cbits,1002) ncrc12 !Received CRC12
1002 format(75x,b12) 1002 format(75x,b12)
i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32) i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),transfer(128+64+32,0_1))
i1Dec8BitBytes(11)=0 i1Dec8BitBytes(11)=0
icrc12=crc12(c_loc(i1Dec8BitBytes),11) !CRC12 computed from 75 msg bits icrc12=crc12(c_loc(i1Dec8BitBytes),11) !CRC12 computed from 75 msg bits
@ -26,7 +26,7 @@ subroutine extractmessage174(decoded,msgreceived,ncrcflag)
do ibyte=1,12 do ibyte=1,12
itmp=0 itmp=0
do ibit=1,6 do ibit=1,6
itmp=ishft(itmp,1)+iand(1,decoded((ibyte-1)*6+ibit)) itmp=ishft(itmp,1)+iand(1_1,decoded((ibyte-1)*6+ibit))
enddo enddo
i4Dec6BitWords(ibyte)=itmp i4Dec6BitWords(ibyte)=itmp
enddo enddo

4
lib/ft8/extractmessage174_91.f90
View File

@ -17,7 +17,7 @@ subroutine extractmessage174_91(decoded,msgreceived,ncrcflag)
read(cbits,1002) ncrc14 !Received CRC12 read(cbits,1002) ncrc14 !Received CRC12
1002 format(77x,b14) 1002 format(77x,b14)
i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),128+64+32+16+8) i1Dec8BitBytes(10)=iand(i1Dec8BitBytes(10),transfer(128+64+32+16+8,0_1))
i1Dec8BitBytes(11:12)=0 i1Dec8BitBytes(11:12)=0
icrc14=crc14(c_loc(i1Dec8BitBytes),12) !CRC12 computed from 75 msg bits icrc14=crc14(c_loc(i1Dec8BitBytes),12) !CRC12 computed from 75 msg bits
@ -26,7 +26,7 @@ subroutine extractmessage174_91(decoded,msgreceived,ncrcflag)
do ibyte=1,12 do ibyte=1,12
itmp=0 itmp=0
do ibit=1,6 do ibit=1,6
itmp=ishft(itmp,1)+iand(1,decoded((ibyte-1)*6+ibit)) itmp=ishft(itmp,1)+iand(1_1,decoded((ibyte-1)*6+ibit))
enddo enddo
i4Dec6BitWords(ibyte)=itmp i4Dec6BitWords(ibyte)=itmp
enddo enddo

2
lib/msk40decodeframe.f90
View File

@ -128,7 +128,7 @@ subroutine msk40decodeframe(c,mycall,hiscall,xsnr,bswl,nhasharray, &
imsg=0 imsg=0
do i=1,16 do i=1,16
imsg=ishft(imsg,1)+iand(1,decoded(17-i)) imsg=ishft(imsg,1)+iand(1_1,decoded(17-i))
enddo enddo
nrxrpt=iand(imsg,15) nrxrpt=iand(imsg,15)
nrxhash=(imsg-nrxrpt)/16 nrxhash=(imsg-nrxrpt)/16