config.txt oscpad.nds @@ -1,7 +1,7 @@ build/* arm7/build/* arm9/build/* -*.nds +#*.nds *.ds.gba *.elf *.arm9 .gitignore @@ -39,7 +39,7 @@ LDFLAGS = -specs=ds_arm9.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- -LIBS := -ldswifi9 -lnds9 +LIBS := -lfat -ldswifi9 -lnds9 #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing arm9/Makefile @@ -30,6 +30,7 @@ #include <netinet/in.h> #include <netdb.h> #include <nds/arm9/ndsmotion.h> +#include <fat.h> #define ADDRESS "10.0.2.1" @@ -59,7 +60,6 @@ void arm9_fifo() { // check incoming fifo messages char sendbuf[4096]; struct sockaddr_in sain; int sock; -int portnum = PORT; int copyOSCString(char *dest, char *src) { @@ -162,7 +162,13 @@ int main(void) { //touchPosition touchXY; int i; - unsigned long destip = 16908298; + char configData[1024]; + char *returnCode; + + char hostname[1024]; + int portnum; + + hostent *hostByName; int ndsmotion; @@ -189,6 +195,45 @@ int main(void) { } else { iprintf("NDSMotion not present\n"); } + + fatInitDefault(); + + // trying to read config file now + + // + strcpy(hostname, ADDRESS); + portnum = PORT; + + iprintf("trying to open /oscpad/config.txt\n"); + + FILE* configFile = fopen ("/oscpad/config.txt", "rb"); + + // ugly fugly config file parsing + if (configFile) { + char *portName; + char *hostName; + int success = 0; + while(!success) { + returnCode = fgets(configData, 255, configFile); + if (!returnCode) break; + hostName = strtok(configData, ":"); + if (!hostName) continue; + portName = strtok(NULL, ":"); + if (!portName) continue; + strcpy(hostname, hostName); + portnum = atoi(portName); + break; + } + } else { + iprintf("no config file found. make one :)\n"); + } + iprintf("netconf: %s:%d\n", hostname, portnum); + + fclose(configFile); + iprintf("closed config file\n"); + + + { // send fifo message to initialize the arm7 wifi REG_IPC_FIFO_CR = IPC_FIFO_ENABLE | IPC_FIFO_SEND_CLEAR; // enable & clear FIFO @@ -243,6 +288,16 @@ int main(void) { //closesocket(my_socket); // remove the socket. + + hostByName = gethostbyname(hostname); + + if (!hostByName) + { + iprintf("gethostbyname() failed. aborting.\n"); + return 0; + } + + sock=socket(AF_INET,SOCK_DGRAM,0); sain.sin_family=AF_INET; sain.sin_port=htons(portnum); @@ -252,7 +307,7 @@ int main(void) { sain.sin_family=AF_INET; sain.sin_port=htons(portnum); - sain.sin_addr.s_addr=destip; + sain.sin_addr = *(struct in_addr*) hostByName->h_addr_list[0]; while(1) { arm9/source/main.cpp c43b6b078e78eff43f0976618fd1c9f686487145 Jan Krutisch jan@krutisch.de http://github.com/halfbyte/nds-oscpad/commit/0ebd09557b7747d9afae0c568a12495b26c7d080 0ebd09557b7747d9afae0c568a12495b26c7d080 2008-08-18T07:47:10-07:00 2008-08-18T07:47:10-07:00 config file, configurable network address e12fa7644bfd17228e5085c5e044a368ef58a266 Jan Krutisch jan@krutisch.de