[core] Fix type defs and warning.

Author: DC-SWAT

include/SDL/SDL_stdinc.h

@@ -74,7 +74,7 @@
 #ifdef __DREAMCAST__
 void *memcpy_sh4(void *dest, const void *src, size_t count);
 void *memmove_sh4(void *dest, const void *src, size_t count);
-void *memset_sh4(void *dest, uint32 val, size_t count);
+void *memset_sh4(void *dest, uint32_t val, size_t count);
 #endif
 
 /* The number of elements in an array */

include/network/http.h

@@ -6,36 +6,36 @@
  */
 
 #ifndef _DS_HTTP_H
-#define _DS_HTTP_H
+#define _DS_HTTP_H
 
 #include <kos/net.h>
-#include <sys/socket.h>
-
-/* File systems */
+#include <sys/socket.h>
+
+/* File systems */
 int tcpfs_init();
 void tcpfs_shutdown();
 
 int httpfs_init();
 void httpfs_shutdown();
 
-
+
 /* DSN utils */
-int dns_init(const uint8 *ip);
-int dns(const char *name, struct in_addr* addr);
-int ds_gethostbyname(const struct sockaddr_in * dnssrv, const char *name, uint8 *ipout);
-
-
-/* URL utils */
+int dns_init(const uint8_t *ip);
+int dns(const char *name, struct in_addr* addr);
+int ds_gethostbyname(const struct sockaddr_in * dnssrv, const char *name, uint8_t *ipout);
+
+
+/* URL utils */
 void _url_split(char *proto, int proto_size,
                char *hostname, int hostname_size,
                int *port_ptr,
                char *path, int path_size,
-               const char *url);
-			   
-
-/* httpd server */
-int httpd_init(int port);
-void httpd_shutdown();
-
-
+               const char *url);
+			   
+
+/* httpd server */
+int httpd_init(int port);
+void httpd_shutdown();
+
+
 #endif /* _DS_HTTP_H */

include/utils.h

@@ -53,7 +53,7 @@ int is_hacked_bios();
 int is_custom_bios();
 int is_no_syscalls();
 
-uint32 gzip_get_file_size(const char *filename);
+uint32_t gzip_get_file_size(const char *filename);
 
 void dbgio_set_dev_ds();
 void dbgio_set_dev_scif();
@@ -85,7 +85,7 @@ char *strndup(const char *, size_t);
 /* Optimized memory utils */
 void *memcpy_sh4(void *dest, const void *src, size_t count);
 void *memmove_sh4(void *dest, const void *src, size_t count);
-void *memset_sh4(void *dest, uint32 val, size_t count);
+void *memset_sh4(void *dest, uint32_t val, size_t count);
 
 #ifndef strcasestr
 char *strcasestr(const char *str1, const char *str2);

lib/SDL_image/IMG_pvr.c

@@ -95,7 +95,7 @@ SDL_Surface *IMG_LoadPVR_RW(SDL_RWops *src)
 	Uint32 Amask;
 	SDL_Surface *surface = NULL;
 	char *error = NULL;
-	uint8 *data;
+	uint8_t *data;
 
 	if ( !src ) {
 		/* The error message has been set in SDL_RWFromFile */
@@ -111,7 +111,7 @@ SDL_Surface *IMG_LoadPVR_RW(SDL_RWops *src)
 	fprintf(stderr, "IMG_LoadPVR_RW: %d bytes\n", len);
 #endif
 
-	data = (uint8*) memalign(32, len);
+	data = (uint8_t*) aligned_alloc(32, len);
 
 	if(data == NULL) {
 		error = "no free memory";

src/irq/exceptions.c

@@ -145,19 +145,21 @@ static void guard_irq_handler(irq_t source, irq_context_t *context, void *data)
 
 		/* not handled --> panic !! */
 		//irq_dump_regs(0, source);
-		
+
 		dbgio_set_dev_fb();
 		vid_clear(0, 0, 0);
 		ConsoleInformation *con = GetConsole();
-		
+
 		for(i = 16; i > 0; i--) {
 			dbglog(DBG_INFO, "%s\n", con->ConsoleLines[i]);
 		}
-		
-		dbglog(DBG_ERROR, "Unhandled Exception. Reboot after 10 seconds.");
+
+		dbglog(DBG_ERROR, "Unhandled Exception. Reboot after 3 seconds.");
 
 		//panic("Unhandled IRQ/Exception");
-		timer_spin_sleep(10000);
+		uint64_t timeout = timer_ms_gettime64() + 3000;
+		while(timer_ms_gettime64() < timeout);
+
 		arch_reboot();
 //		asic_sys_reset();
 	}