Enable telnet console, add crash dump handling options, minor misc changes

libxenon.dockerfile

@@ -1,6 +1,6 @@
 FROM free60/toolchain:latest
 
-RUN apt update && apt install nano && \
+RUN apt update && apt install nano bc && \
   apt -y clean autoclean autoremove && \
   rm -rf /var/lib/{apt,dpkg,cache,log}/
 

libxenon/drivers/console/telnet_console.c

@@ -39,7 +39,7 @@ static int session_states = TELNET_DISCONNECTED;
 
 static struct tcp_pcb *tel_pcb;
 
-extern void (*stdout_hook)(const char *buf, int len);
+extern void (*stdout_hook)(char *buf, int len);
 
 /**==========================================================================*/
 /* Forward Declarations                                                      */
@@ -82,7 +82,7 @@ void telnet_console_close(void) {
 }
 
 /*===========================================================================*/
-void telnet_console_tx_print(const char *buf, int bc) {
+void telnet_console_tx_print(char *buf, int bc) {
     TEL_TXST *st;
 
     if (session_states != TELNET_CONNECTED) {
@@ -140,36 +140,39 @@ static void telnet_send(struct tcp_pcb *pcb, TEL_TXST *st) {
 }
 
 //recv buffer ...
-int recv_len;
-unsigned char recv_buf[512];
+int telnet_recv_len;
+unsigned char telnet_recv_buf[512];
 
 /*===========================================================================*/
 static err_t telnet_recv(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) {
 
-#if 0
     if (err == ERR_OK && p != NULL) {
         unsigned char * payload = (unsigned char*) p->payload;
 
         tcp_recved(pcb, p->tot_len); /* some recieved data */
 
         //caractere par caractere
         if (p->tot_len == 1) {
-            recv_buf[recv_len] = payload[0];
-            recv_len++;
+            telnet_recv_buf[telnet_recv_len] = payload[0];
+            telnet_recv_len++;
         }//par block
         else {
-            memcpy(recv_buf + recv_len, payload, p->tot_len);
-            recv_len += p->tot_len;
+            memcpy(telnet_recv_buf + telnet_recv_len, payload, p->tot_len);
+            telnet_recv_len += p->tot_len;
         }
 
-        if (recv_len > 2) {
-            if ((recv_buf[recv_len - 2] == '\r')&(recv_buf[recv_len - 1] == '\n')) {
-                ParseArgs(recv_buf, recv_len);
-                //DebugBreak();
-                //tel_tx_str(recv_buf, recv_len);
-                //efface
-                recv_len = 0;
-                memset(recv_buf, 0, 512);
+        if (telnet_recv_len > 2) {
+            if ((telnet_recv_buf[telnet_recv_len - 2] == '\r')&(telnet_recv_buf[telnet_recv_len - 1] == '\n')) {
+                // ParseArgs(telnet_recv_buf, telnet_recv_len);
+                // DebugBreak();
+                // tel_tx_str(telnet_recv_buf, telnet_recv_len);
+                // efface
+
+                // Echo char - optional feedback for the user. All receive buffers will be echoed on a new line.
+                // telnet_console_tx_print(telnet_recv_buf, telnet_recv_len);
+
+                telnet_recv_len = 0;
+                memset(telnet_recv_buf, 0, 512);
             }
         }
     }
@@ -178,7 +181,6 @@ static err_t telnet_recv(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t e
     if (err == ERR_OK && p == NULL) {
         telnet_close(pcb);
     }
-#endif
 
     return ERR_OK;
 }
@@ -203,4 +205,4 @@ static err_t telnet_accept(void *arg, struct tcp_pcb *pcb, err_t err) {
 }
 
 /*===========================================================================*/
-/* End of Module */
+/* End of Module */

libxenon/drivers/console/telnet_console.h

@@ -6,9 +6,13 @@ extern "C" {
 #endif
 
 void telnet_console_init();
-void telnet_console_tx_print(const char *buf, int bc);
+void telnet_console_tx_print(char *buf, int bc);
 void telnet_console_close();
 
+// Use these in LibXenon programs to get chars or strings from the telnet buffer.
+extern int telnet_recv_len;
+extern unsigned char telnet_recv_buf[512];
+
 #ifdef __cplusplus
 };
 #endif

libxenon/drivers/elf/elf.c

@@ -18,6 +18,7 @@ see file COPYING or http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 #include <time/time.h>
 #include <unistd.h>
 #include <xenon_soc/xenon_power.h>
+#include <console/console.h>
 
 #include "elf.h"
 #include "elf_abi.h"

libxenon/drivers/network/network.c

@@ -64,10 +64,10 @@ void network_init()
 
 	dhcp_wait=mftb();
 	int i = 0;
-	while (netif.ip_addr.addr==0 && i < 60) {
+	while (netif.ip_addr.addr==0 && i < 90) {
 		network_poll();
 		now2=mftb();
-		if (tb_diff_msec(now2, dhcp_wait) >= 250){
+		if (tb_diff_msec(now2, dhcp_wait) >= 300){
 			dhcp_wait=mftb();
 			i++;
 			if (i % 2)

libxenon/drivers/ppc/c_except.c

@@ -1,4 +1,6 @@
 #include <console/console.h>
+#include <console/telnet_console.h>
+#include <input/input.h>
 #include <ppc/cache.h>
 #include <ppc/register.h>
 #include <stdio.h>
@@ -9,6 +11,8 @@
 #include <xenon_uart/xenon_uart.h>
 #include <xenos/xenos.h>
 #include <xetypes.h>
+#include <usb/usbmain.h>
+#include <network/network.h>
 
 #define CPU_STACK_TRACE_DEPTH		10
 
@@ -76,46 +80,118 @@ void crashdump(u32 exception,u64 * context)
 	console_set_colors(0x000080ff, 0xffffffff);
 	console_init();
 	console_clrscr();
-
+	printf("Program crashed - reinitializing hardware in this context...\n");
+	network_init();
+	usb_init();
+	network_print_config();
+	telnet_console_init();
+
+	// Give some extra time to catch the trace
+	mdelay(3000);
+
+	// In case the trace is missed, print it again exactly as it was.
+	reprint:
+
 	if (exception){
 		sprintf(text,"\nException vector! (%p)\n\n",exception);
 	}else{
 		strcpy(text,"\nSegmentation fault!\n\n");
 	}
-
+
+	printf(text);
 	flush_console();
 
 	sprintf(text,"%spir=%016llx dar=%016llx\nsr0=%016llx sr1=%016llx lr=%016llx\n\n",
 			text,context[39],context[38],context[36],context[37],context[32]);
 
+	printf(text);
 	flush_console();
-	
+
 	int i;
 	for(i=0;i<8;++i)
 		sprintf(text,"%s%02d=%016llx %02d=%016llx %02d=%016llx %02d=%016llx\n",
 				text,i,context[i],i+8,context[i+8],i+16,context[i+16],i+24,context[i+24]);
 
+	printf(text);
 	flush_console();
 
 	_cpu_print_stack((void*)(u32)context[36],(void*)(u32)context[32],(void*)(u32)context[1]);
-
-	strcat(text,"\n\nOn uart: 'x'=Xell, 'h'=Halt, 'r'=Reboot\n\n");
 
+	strcat(text,"\n\nOn controller, UART or telnet: 'x'=Xell, 'y'=Halt, 'b'=Reboot, 'a'=Reprint stack trace.\n");
+	printf(text);
 	flush_console();
 
+	// Initialize 360 controller - taken from XeLL kbootconf.c
+	struct controller_data_s ctrl;
+	struct controller_data_s old_ctrl;
+
+	// For telnet handling.
+	unsigned char latest_telnet_char;
+
 	for(;;){
-		switch(getch()){
-			case 'x':
+		// Handle controller
+		if (get_controller_data(&ctrl, 0)) {
+			if (ctrl.x){
 				exit(0);
+				for(;;);
 				break;
-			case 'h':
+			} if (ctrl.y){
 				xenon_smc_power_shutdown();
 				for(;;);
 				break;
-			case 'r':
+			} if (ctrl.b){
 				xenon_smc_power_reboot();
 				for(;;);
 				break;
+			} if (ctrl.a){
+				goto reprint;
+			}
+			old_ctrl=ctrl;
+		}
+
+		// Controller update
+		usb_do_poll();
+
+		// Telnet update
+		network_poll();
+		latest_telnet_char = telnet_recv_buf[0];
+
+		// Handle UART
+		if(kbhit()){
+			switch(getch()){
+				case 'x':
+					// Try reloading XeLL from NAND. (1f, 2f, gggggg)
+					// Platform specific functioanlity defined in libxenon/drivers/newlib/xenon_syscalls.c
+					exit(0);
+					break;
+				case 'y':
+					xenon_smc_power_shutdown();
+					for(;;);
+					break;
+				case 'b':
+					xenon_smc_power_reboot();
+					for(;;);
+					break;
+				case 'a':
+					goto reprint;
+			}
+		}
+
+		// Handle telnet
+		if(latest_telnet_char == 'x'){
+			exit(0);
+			for(;;);
+			break;
+		} else if(latest_telnet_char == 'y'){
+			xenon_smc_power_shutdown();
+			for(;;);
+			break;
+		} else if(latest_telnet_char == 'b'){
+			xenon_smc_power_reboot();
+			for(;;);
+			break;
+		} else if(latest_telnet_char == 'a'){
+			goto reprint;
 		}
 	}
 }

libxenon/drivers/xenon_nand/xenon_sfcx.c

@@ -5,6 +5,7 @@
 #include <fcntl.h>
 #include <time/time.h>
 #include <xb360/xb360.h>
+#include <string.h>
 #include "xenon_sfcx.h"
 
 struct sfc sfc = {0};

libxenon/drivers/xenon_soc/xenon_power.h

@@ -14,10 +14,11 @@ void xenon_thread_startup(void);
 #define XENON_SPEED_FULL 1
 
 void xenon_make_it_faster(int speed);
-int  xenon_run_thread_task(int thread, void *stack, void *task);
+int xenon_run_thread_task(int thread, void *stack, void *task);
 int xenon_is_thread_task_running(int thread);
 void xenon_sleep_thread(int thread);
 void xenon_set_single_thread_mode();
+int xenon_get_speed();
 
 #ifdef __cplusplus
 };