ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Static picotcp config for msvc. Fix warnings in modem.cpp.

This commit is contained in:
Flyinghead 2018-09-17 14:05:03 +02:00
parent bfc944a138
commit 92a39a1fc4
5 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/deps/picotcp/include/pico_config.h
View File

@ -3,7 +3,12 @@
See COPYING, LICENSE.GPLv2 and LICENSE.GPLv3 for usage.
*********************************************************************/
#ifdef _MS_VER
#include "pico_defines_msvc.h"
#else
#include "pico_defines.h"
#endif
#ifndef INCLUDE_PICO_CONFIG
#define INCLUDE_PICO_CONFIG
#ifndef __KERNEL__

14
core/deps/picotcp/include/pico_defines_msvc.h Normal file
View File

@ -0,0 +1,14 @@
// pico_defines.h for MS VC
#ifndef PICO_DEFINES_H
#define PICO_DEFINES_H
#define PICO_SUPPORT_ETH
#define PICO_SUPPORT_IPV4
#define PICO_SUPPORT_IPV4FRAG
#define PICO_SUPPORT_ICMP4
#define PICO_SUPPORT_TCP
#define PICO_SUPPORT_UDP
#define PICO_SUPPORT_DNS_CLIENT
#define PICO_SUPPORT_CRC
#define PICO_SUPPORT_PPP
#endif

2
core/deps/picotcp/modules/pico_dhcp_client.h
View File

@ -7,7 +7,7 @@
*********************************************************************/
#ifndef INCLUDE_PICO_DHCP_CLIENT
#define INCLUDE_PICO_DHCP_CLIENT
#include "pico_defines.h"
#include "pico_config.h"
#ifdef PICO_SUPPORT_UDP
#include "pico_dhcp_common.h"
#include "pico_addressing.h"

2
core/deps/picotcp/modules/pico_icmp4.h
View File

@ -7,7 +7,7 @@
*********************************************************************/
#ifndef INCLUDE_PICO_ICMP4
#define INCLUDE_PICO_ICMP4
#include "pico_defines.h"
#include "pico_config.h"
#include "pico_addressing.h"
#include "pico_protocol.h"

10
core/hw/modem/modem.cpp
View File

@ -298,8 +298,14 @@ static int modem_sched_func(int tag, int c, int j)
callback_cycles = SH4_MAIN_CLOCK / 1000000 * 238; // 238 us
break;
default:
break;
}
break;
default:
break;
}
update_interrupt();
@ -455,7 +461,7 @@ static void ModemNormalWrite(u32 reg, u32 data)
switch(reg)
{
case 0x02:
modem_regs.reg0f.RTSDT = modem_regs.reg02.v0.RTSDE & connect_state == CONNECTED;
modem_regs.reg0f.RTSDT = modem_regs.reg02.v0.RTSDE && connect_state == CONNECTED;
break;
case 0x06:
@ -610,7 +616,7 @@ static void ModemNormalWrite(u32 reg, u32 data)
}
}
// Don't allow NEWS to be set if 0
if (old & (1 << 3) == 0)
if ((old & (1 << 3)) == 0)
modem_regs.reg1f.NEWS = 0;
if (!modem_regs.reg1f.NEWS)
{