Changeset 189 in Main for trunk/Server

Timestamp:

Sep 29, 2024, 9:37:00 AM (7 weeks ago)

Author:

Nishi

Message:

will try to fix ps2 later

Location:

trunk/Server

Files:

• Makefile (modified) (2 diffs)
• config.c (modified) (1 diff)
• main.c (modified) (3 diffs)
• module.c (modified) (1 diff)
• server.c (modified) (2 diffs)
• strptime.h (modified) (1 diff)

trunk/Server/Makefile

@@ -6 +6 @@
 .SUFFIXES: .c .o
 
-OBJS = version.o main.o config.o server.o http.o module.o strptime.o $(EXTOBJS) $(PREOBJS)
+OBJS = main.o version.o config.o server.o http.o module.o strptime.o $(EXTOBJS) $(PREOBJS)
 
 all: tewi$(EXEC) $(TARGET)
@@ -13 +13 @@
 
 tewi$(EXEC): $(OBJS) ../Common/common.a
-        $(CC) $(LDFLAGS) $(EXTLDFLAGS) -o $@ $(OBJS) $(EXTLIBS) $(LIBS) ../Common/common.a
+        $(CC) $(LDFLAGS) $(EXTLDFLAGS) -o $@ $(OBJS) $(EXTLIBS) ../Common/common.a $(LIBS)
         $(SERVADD)
 

trunk/Server/config.c

@@ -106 +106 @@
 #elif defined(__PPU__)
         strcpy(config.hostname, "ps3");
+#elif defined(__ps2sdk__)
+        strcpy(config.hostname, "ps2");
 #else
         gethostname(config.hostname, 1024);

trunk/Server/main.c

@@ -5 +5 @@
 #include "../config.h"
 
+#include <unistd.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -40 +41 @@
 #define printf(...) pspDebugScreenPrintf(__VA_ARGS__)
 #define STDERR_LOG(...) pspDebugScreenPrintf(__VA_ARGS__)
+#elif defined(__ps2sdk__)
+#include <debug.h>
+#include <sifrpc.h>
+
+#define printf(...) scr_printf(__VA_ARGS__)
+#define STDERR_LOG(...) scr_printf(__VA_ARGS__)
 #else
 #define STDERR_LOG(...) fprintf(stderr, __VA_ARGS__)
@@ -244 +251 @@
         printf("PS3 Bootstrap, Tewi/%s\n", tw_get_version());
         netInitialize();
+#elif defined(__ps2sdk__)
+        SifInitRpc(0);
+        init_scr();
+        scr_printf("PS2 Bootstrap, Tewi/%s\n", tw_get_version());
+        while(1)
+                ;
 #endif
         int st = startup(argc, argv);

trunk/Server/module.c

@@ -16 +16 @@
 extern struct tw_config config;
 
-#if defined(_PSP) || defined(__PPU__)
+#if defined(_PSP) || defined(__PPU__) || defined(__ps2sdk__)
 void* tw_module_load(const char* path) { return NULL; }
 

trunk/Server/server.c

@@ -62 +62 @@
 #endif
 
-#ifdef _PSP
+#if defined(_PSP) || defined(__ps2sdk__)
 #include "strptime.h"
 #endif
@@ -522 +522 @@
                                         struct tm tm;
                                         strptime(req.headers[i + 1], "%a, %d %b %Y %H:%M:%S GMT", &tm);
-#if defined(__MINGW32__) || defined(_PSP) || defined(__PPU__)
+#if defined(__MINGW32__) || defined(_PSP) || defined(__PPU__) || defined(__ps2sdk__)
                                         time_t t = 0;
                                         struct tm* btm = localtime(&t);

trunk/Server/strptime.h

@@ -8 +8 @@
 #include <time.h>
 
-#if defined(_WIN32) || defined(_PSP)
+#if defined(_WIN32) || defined(_PSP) || defined(__ps2sdk__)
 char* strptime(const char *buf, const char *fmt, struct tm *tm);
 #endif