External/pspsdk
1
0
Fork 0
mirror of https://github.com/pspdev/pspsdk.git synced 2025-12-26 02:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #204 from xyzshantaram/patch-2

Browse Source 
samples/net/simple: Run in user mode instead of kernel mode
This commit is contained in:
Diamond Rivero
2024-05-19 10:24:50 +08:00
committed by GitHub
parent 91c849e5e5 cba9b99fd2
commit 9a1a84e073
2 changed files with 47 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -33,3 +33,6 @@ install-sh
missing
src/base/linkfile.prx
stamp-h1
.clang-format
compile_flags.txt

97
src/samples/net/simple/main.c
View File

@@ -9,28 +9,25 @@
* Some small parts (c) 2005 PSPPet
*
*/
#include <arpa/inet.h>
#include <errno.h>
#include <pspkernel.h>
#include <pspdebug.h>
#include <pspnet_apctl.h>
#include <pspsdk.h>
#include <stdlib.h>
#include <psputility.h>
#include <string.h>
#include <unistd.h>
#include <pspnet.h>
#include <pspnet_inet.h>
#include <pspnet_apctl.h>
#include <pspnet_resolver.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/select.h>
#include <errno.h>
#define printf pspDebugScreenPrintf
#define MODULE_NAME "NetSample"
#define HELLO_MSG "Hello there. Type away.\r\n"
#define HELLO_MSG "Hello there. Type away.\r\n"
PSP_MODULE_INFO(MODULE_NAME, 0x1000, 1, 1);
PSP_MAIN_THREAD_ATTR(0);
PSP_MODULE_INFO(MODULE_NAME, 0, 1, 1);
PSP_HEAP_THRESHOLD_SIZE_KB(1024);
PSP_HEAP_SIZE_KB(-2048);
PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);
PSP_MAIN_THREAD_STACK_SIZE_KB(1024);
/* Exit callback */
int exit_callback(int arg1, int arg2, void *common)
@@ -56,9 +53,9 @@ int SetupCallbacks(void)
{
int thid = 0;
thid = sceKernelCreateThread("update_thread", CallbackThread,
0x11, 0xFA0, PSP_THREAD_ATTR_USER, 0);
if(thid >= 0)
thid =
sceKernelCreateThread("update_thread", CallbackThread, 0x11, 0xFA0, PSP_THREAD_ATTR_USER, 0);
if (thid >= 0)
{
sceKernelStartThread(thid, 0, 0);
}
@@ -75,7 +72,7 @@ int make_socket(uint16_t port)
struct sockaddr_in name;
sock = socket(PF_INET, SOCK_STREAM, 0);
if(sock < 0)
if (sock < 0)
{
return -1;
}
@@ -83,8 +80,8 @@ int make_socket(uint16_t port)
name.sin_family = AF_INET;
name.sin_port = htons(port);
name.sin_addr.s_addr = htonl(INADDR_ANY);
ret = bind(sock, (struct sockaddr *) &name, sizeof(name));
if(ret < 0)
ret = bind(sock, (struct sockaddr *)&name, sizeof(name));
if (ret < 0)
{
return -1;
}
@@ -107,14 +104,14 @@ void start_server(const char *szIpAddr)
/* Create a socket for listening */
sock = make_socket(SERVER_PORT);
if(sock < 0)
if (sock < 0)
{
printf("Error creating server socket\n");
return;
}
ret = listen(sock, 1);
if(ret < 0)
if (ret < 0)
{
printf("Error calling listen\n");
return;
@@ -126,35 +123,34 @@ void start_server(const char *szIpAddr)
FD_SET(sock, &set);
setsave = set;
while(1)
while (1)
{
int i;
set = setsave;
if(select(FD_SETSIZE, &set, NULL, NULL, NULL) < 0)
if (select(FD_SETSIZE, &set, NULL, NULL, NULL) < 0)
{
printf("select error\n");
return;
}
for(i = 0; i < FD_SETSIZE; i++)
for (i = 0; i < FD_SETSIZE; i++)
{
if(FD_ISSET(i, &set))
if (FD_ISSET(i, &set))
{
int val = i;
if(val == sock)
if (val == sock)
{
new = accept(sock, (struct sockaddr *) &client, &size);
if(new < 0)
new = accept(sock, (struct sockaddr *)&client, &size);
if (new < 0)
{
printf("Error in accept %s\n", strerror(errno));
close(sock);
return;
}
printf("New connection %d from %s:%d\n", val,
inet_ntoa(client.sin_addr),
ntohs(client.sin_port));
printf("New connection %d from %s:%d\n", val, inet_ntoa(client.sin_addr),
ntohs(client.sin_port));
write(new, HELLO_MSG, strlen(HELLO_MSG));
@@ -163,7 +159,7 @@ void start_server(const char *szIpAddr)
else
{
readbytes = read(val, data, sizeof(data));
if(readbytes <= 0)
if (readbytes <= 0)
{
printf("Socket %d closed\n", val);
FD_CLR(val, &setsave);
@@ -212,14 +208,14 @@ int connect_to_apctl(int config)
stateLast = state;
}
if (state == 4)
break; // connected with static IP
break; // connected with static IP
// wait a little before polling again
sceKernelDelayThread(50*1000); // 50ms
sceKernelDelayThread(50 * 1000); // 50ms
}
printf(MODULE_NAME ": Connected!\n");
if(err != 0)
if (err != 0)
{
return 0;
}
@@ -230,31 +226,26 @@ int connect_to_apctl(int config)
int net_thread(SceSize args, void *argp)
{
int err;
do
{
if((err = pspSdkInetInit()))
if ((err = pspSdkInetInit()))
{
printf(MODULE_NAME ": Error, could not initialise the network %08X\n", err);
break;
}
if(connect_to_apctl(1))
if (connect_to_apctl(1))
{
// connected, get my IPADDR and run test
union SceNetApctlInfo info;
if (sceNetApctlGetInfo(8, &info) != 0)
strcpy(info.ip, "unknown IP");
start_server(info.ip);
}
}
while(0);
return 0;
} while (0);
}
/* Simple thread */
int main(int argc, char **argv)
{
@@ -262,17 +253,17 @@ int main(int argc, char **argv)
SetupCallbacks();
sceUtilityLoadNetModule(PSP_NET_MODULE_COMMON);
sceUtilityLoadNetModule(PSP_NET_MODULE_INET);
pspDebugScreenInit();
if(pspSdkLoadInetModules() < 0)
{
printf("Error, could not load inet modules\n");
sceKernelSleepThread();
}
/* Create a user thread to do the real work */
thid = sceKernelCreateThread("net_thread", net_thread, 0x18, 0x10000, PSP_THREAD_ATTR_USER, NULL);
if(thid < 0)
thid = sceKernelCreateThread("net_thread", net_thread,
0x11, // default priority
256 * 1024, // stack size (256KB is regular default)
PSP_THREAD_ATTR_USER, NULL);
if (thid < 0)
{
printf("Error, could not create thread\n");
sceKernelSleepThread();