w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-04-13 06:48:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some comments and do not compare ints with floats.

Browse Source
This commit is contained in:
Joe Taylor 2020-03-16 11:08:09 -04:00
parent d6cc789f40
commit 8b8cadcf3a
1 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/jt9a.f90
View File

@ -25,44 +25,18 @@ subroutine jt9a()
msdelay=30
call c_f_pointer(shmem_address(),shared_data)
<<<<<<< HEAD
<<<<<<< HEAD
! Terminate if ipc(2) is 999
10 call lock_jt9()
if(shared_data%ipc(2).eq.999) then
call unlock_jt9()
i1=detach_jt9()
10 ok=shmem_lock()
if(.not.ok) call abort
if(shared_data%ipc(2).eq.999.0) then
ok=shmem_unlock()
ok=shmem_detach()
go to 999
endif
! Wait here until GUI has set ipc(2) to 1
if(shared_data%ipc(2).ne.1) then
call unlock_jt9()
=======
! Wait here until GUI has set ips(2) to 1.0
10 ok=shmem_lock()
if(.not.ok) call abort
if(shared_data%ipc(2).eq.999.0) then
ok=shmem_unlock()
ok=shmem_detach()
go to 999
endif
if(shared_data%ipc(2).ne.1.0) then
ok=shmem_unlock()
if(.not.ok) call abort
>>>>>>> 488c2e8066c538e496ff5d7caf8655a065525976
=======
! Wait here until GUI has set ips(2) to 1.0
10 ok=shmem_lock()
if(.not.ok) call abort
if(shared_data%ipc(2).eq.999.0) then
ok=shmem_unlock()
ok=shmem_detach()
go to 999
endif
if(shared_data%ipc(2).ne.1.0) then
ok=shmem_unlock()
if(.not.ok) call abort
>>>>>>> 488c2e8066c538e496ff5d7caf8655a065525976
call sleep_msec(msdelay)
go to 10
endif
@ -103,25 +77,12 @@ subroutine jt9a()
call timer('decoder ',1)
<<<<<<< HEAD
<<<<<<< HEAD
! Wait here until GUI routine decodeDone() has set ipc(3) to 1
100 call lock_jt9()
if(shared_data%ipc(3).ne.1) then
call unlock_jt9()
=======
=======
>>>>>>> 488c2e8066c538e496ff5d7caf8655a065525976
! Wait here until GUI routine decodeDone() has set ipc(3) to 1.0
100 ok=shmem_lock()
if(.not.ok) call abort
if(shared_data%ipc(3).ne.1.0) then
if(shared_data%ipc(3).ne.1) then
ok=shmem_unlock()
if(.not.ok) call abort
<<<<<<< HEAD
>>>>>>> 488c2e8066c538e496ff5d7caf8655a065525976
=======
>>>>>>> 488c2e8066c538e496ff5d7caf8655a065525976
call sleep_msec(msdelay)
go to 100
endif