various fixes

Author: devwizard64

client/makefile

@@ -3,17 +3,13 @@
 #         This project is licensed under the terms of the GNU General
 #         Public License version 2.  See LICENSE for more information.
 
-.PHONY: default
-default: build/sm64net build/sm64net.exe build/sm64net_usb
+build/sm64net: src/main.c src/net.c src/mem.c
 
-SRC := src/main.c src/net.c src/mem.c
-build/sm64net: $(SRC)
-build/sm64net.exe: $(SRC)
+build/sm64net.exe: src/main.c src/net.c src/mem.c
 build/sm64net.exe: CC  := i686-w64-mingw32-gcc -mconsole -D_WIN32_WINNT=0x0600
 build/sm64net.exe: LIB := -lws2_32
 
-SRC := src/main.c src/net.c src/mem_usb.c
-build/sm64net_usb: $(SRC)
+build/sm64net_usb: src/main.c src/net.c src/mem_usb.c
 build/sm64net_usb: LIB := -lftdi
 
 include ../include/native.mk

client/src/main.c

@@ -21,7 +21,7 @@ static void main_exit(void)
 #endif
 }
 
-int main(int argc, const char **argv)
+int main(int argc, char *argv[])
 {
     const char *proc;
     const char *addr;
@@ -44,7 +44,7 @@ int main(int argc, const char **argv)
     errno = 0;
     port = strtol(argv[3], NULL, 0);
     if (errno != 0 || port < 1 || port > 65535) eprint("invalid port\n");
-    net_init(proc, addr, port, argv+4, argc-4);
+    net_init(proc, addr, port, argc-4, argv+4);
     while (true) net_update();
     return EXIT_SUCCESS;
 }

client/src/net.c

@@ -112,15 +112,14 @@ static void nff_write(const char *path)
         PTR end   = W(0x0C);
         b += 0x0C;
         if (addr == 0) break;
-        if (addr == (u32)-1) addr = np_table;
+        if (addr == (PTR)-1) addr = np_table;
         mem_write(addr, data+start, end-start);
     }
     free(data);
 }
 
 void net_init(
-    const char *proc, const char *addr, int port,
-    const char **argv, int argc
+    const char *proc, const char *addr, int port, int argc, char *argv[]
 )
 {
     NET_META meta;
@@ -169,8 +168,8 @@ void net_init(
         eprint("server is version %s\n", meta.version);
     }
     mem_init(proc, np_u32(meta.mem_addr));
-    mem_write(NP_TABLE, meta.np_table_b, sizeof(meta.np_table_b));
-    np_table = np_u32(meta.np_table);
+    mem_write(NP_TABLE, meta.np_data_b, sizeof(meta.np_data_b));
+    np_table = np_u32(meta.np_data);
     while (argc-- > 0) nff_write(*argv++);
     puts("Connected.");
 }

client/src/net.h

@@ -11,8 +11,7 @@
 #include <types.h>
 
 extern void net_init(
-    const char *proc, const char *addr, int port,
-    const char **argv, int argc
+    const char *proc, const char *addr, int port, int argc, char *argv[]
 );
 extern void net_update(void);
 

include/native.mk

@@ -12,7 +12,7 @@ CCFLAG  += -D__NATIVE__ -Wall -Wextra -Wpedantic -O2
 
 .PHONY: clean
 clean:
-	rm -rf build
+	rm -f -r build
 
 build/%: | build
 	$(CC) $(CCFLAG) -s -o $@ $^ $(LIB)

include/sm64.mk

@@ -18,7 +18,7 @@ CPPFLAG := $(FLAG) -Umips
 
 .PHONY: clean
 clean:
-	rm -rf build
+	rm -f -r build
 
 build/%.z64: build/%.elf build/crc | build
 	$(OBJCOPY) -O binary $< $@
@@ -39,11 +39,11 @@ build/%.ld.o: | build
 build/%.o: %.c | build
 	$(CC) $(CCFLAG) -c -o $@ $<
 
-build/%.o: %.S | build
+build/%.o: %.sx | build
 	$(CC) $(CCFLAG) -c -o $@ $<
 
 build/crc: crc.c | build
-	cc -Wall -Wextra -Wpedantic -O2 -s -o $@ $<
+	cc -O2 -Wall -Wextra -Wpedantic -s -o $@ $<
 
 build:
 	mkdir -p $@

include/sm64net.h

@@ -10,8 +10,9 @@
 
 #include <types.h>
 
-#define NET_PORT                4352
+#define NET_PORT        4352
 
+#define NP_TABLE        0x80000380
 #define NP_LEN          32
 #define NP_NAME_LEN     32
 #define NP_UDP_LEN      0x80
@@ -110,11 +111,10 @@ NET_PL;
 typedef struct net_meta
 {
     /* 0x00 */  u8      mem_addr_b[4];
-    /* 0x04 */  u8      np_table_b[4];
+    /* 0x04 */  u8      np_data_b[4];
     /* 0x08 */  char    version[0x40-0x08];
 }   /* 0x40 */
 NET_META;
-#define NP_TABLE        0x80000380
 #else
 extern NET_PL *np_table;
 #endif

include/sm64net.ld

@@ -8,4 +8,4 @@
 #define __ASSEMBLER__
 #include <sm64net.h>
 
-np_table = 0x80000380;
+np_table = NP_TABLE;