Magic-Mirror/ftpd
1
0
Fork 0
mirror of https://github.com/mtheall/ftpd.git synced 2024-11-23 01:29:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libnds update

Browse Source
This commit is contained in:
Michael Theall 2024-11-11 18:39:34 -06:00
parent ae7f3d322c
commit 8324d8e71c
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -232,7 +232,7 @@ if(NINTENDO_SWITCH)
nx_generate_nacp(${FTPD_TARGET}.nacp
NAME "${PROJECT_NAME} pro"
AUTHOR "(c) 2023 Michael Theall, Dave Murphy, TuxSH"
AUTHOR "(c) 2024 Michael Theall, Dave Murphy, TuxSH"
VERSION ${PROJECT_VERSION}
)
@ -250,7 +250,7 @@ elseif(NINTENDO_3DS)
ctr_generate_smdh(${FTPD_TARGET}.smdh
NAME "${PROJECT_NAME} classic"
DESCRIPTION "v${PROJECT_VERSION}"
AUTHOR "(c) 2023 Michael Theall, Dave Murphy, TuxSH"
AUTHOR "(c) 2024 Michael Theall, Dave Murphy, TuxSH"
ICON meta/icon.png
)
@ -320,7 +320,7 @@ elseif(NINTENDO_3DS)
ctr_generate_smdh(${FTPD_TARGET}.smdh
NAME "${PROJECT_NAME} pro"
DESCRIPTION "v${PROJECT_VERSION}"
AUTHOR "(c) 2023 Michael Theall, Dave Murphy, TuxSH"
AUTHOR "(c) 2024 Michael Theall, Dave Murphy, TuxSH"
ICON meta/icon.png
)
@ -341,7 +341,7 @@ elseif(NINTENDO_DS)
nds_create_rom(${FTPD_TARGET}
NAME "${PROJECT_NAME} classic"
SUBTITLE1 "v${PROJECT_VERSION}"
SUBTITLE2 "(c) 2023 mtheall"
SUBTITLE2 "(c) 2024 mtheall"
ICON nds/icon.bmp
)
else()

8
include/sockAddr.h
View File

@ -26,14 +26,6 @@
#include <compare>
#include <cstdint>
#ifdef __NDS__
struct sockaddr_storage
{
unsigned short ss_family;
char ss_data[sizeof (struct sockaddr_in) - sizeof (unsigned short)];
};
#endif
/// \brief Socket address
class SockAddr
{

3
include/socket.h
View File

@ -34,8 +34,7 @@ struct pollfd
int revents;
};
using socklen_t = int;
using nfds_t = unsigned int;
using nfds_t = unsigned int;
extern "C" int poll (pollfd *fds_, nfds_t nfds_, int timeout_);

8
source/nds/platform.cpp
View File

@ -52,13 +52,11 @@ bool platform::networkVisible ()
switch (Wifi_AssocStatus ())
{
case ASSOCSTATUS_DISCONNECTED:
case ASSOCSTATUS_CANNOTCONNECT:
s_addr.s_addr = 0;
Wifi_AutoConnect ();
break;
case ASSOCSTATUS_SEARCHING:
case ASSOCSTATUS_AUTHENTICATING:
case ASSOCSTATUS_ASSOCIATING:
case ASSOCSTATUS_ACQUIRINGDHCP:
s_addr.s_addr = 0;
@ -85,7 +83,8 @@ bool platform::networkAddress (SockAddr &addr_)
bool platform::init ()
{
sassert (fatInitDefault (), "Failed to initialize fat");
fatInitDefault ();
defaultExceptionHandler ();
// turn off unused arm7 hardware
powerOff (PM_SOUND_AMP);
@ -119,6 +118,9 @@ bool platform::init ()
bool platform::loop ()
{
if (!pmMainLoop ())
return false;
scanKeys ();
// check if the user wants to exit