wpad: use malloc instead of lwp_wkspace alloc, check for OOM error

Author: Zarithya

wiiuse/io_wii.c

@@ -265,17 +265,18 @@ void wiiuse_sensorbar_enable(int enable)
 	__wiiuse_sensorbar_enable(enable);
 }
 
-void wiiuse_init_cmd_queue(struct wiimote_t *wm)
+int wiiuse_init_cmd_queue(struct wiimote_t *wm)
 {
 	u32 size;
 
 	if (!__queue_buffer[wm->unid]) {
 		size = (MAX_COMMANDS*sizeof(struct cmd_blk_t));
-		__queue_buffer[wm->unid] = __lwp_wkspace_allocate(size);
-		if(!__queue_buffer[wm->unid]) return;
+		__queue_buffer[wm->unid] = malloc(size);
+		if(!__queue_buffer[wm->unid]) return ERR_MEM;
 	}
 
 	__lwp_queue_initialize(&wm->cmdq,__queue_buffer[wm->unid],MAX_COMMANDS,sizeof(struct cmd_blk_t));
+	return ERR_OK;
 }
 
 int wiiuse_io_write(struct wiimote_t *wm,ubyte *buf,int len)

wiiuse/wiiuse.c

@@ -66,14 +66,14 @@ struct wiimote_t** wiiuse_init(int wiimotes, wii_event_cb event_cb) {
 		return NULL;
 
 	if (!__wm) {
-		__wm = __lwp_wkspace_allocate(sizeof(struct wiimote_t*) * wiimotes);
+		__wm = malloc(sizeof(struct wiimote_t*) * wiimotes);
 		if(!__wm) return NULL;
 		memset(__wm, 0, sizeof(struct wiimote_t*) * wiimotes);
 	}
 
 	for (i = 0; i < wiimotes; ++i) {
 		if(!__wm[i])
-			__wm[i] = __lwp_wkspace_allocate(sizeof(struct wiimote_t));
+			__wm[i] = malloc(sizeof(struct wiimote_t));
 
 		memset(__wm[i], 0, sizeof(struct wiimote_t));
 		__wm[i]->unid = i;
@@ -88,7 +88,10 @@ struct wiimote_t** wiiuse_init(int wiimotes, wii_event_cb event_cb) {
 			__wm[i]->sock = NULL;
 			__wm[i]->bdaddr = *BD_ADDR_ANY;
 			__wm[i]->event_cb = event_cb;
-			wiiuse_init_cmd_queue(__wm[i]);
+			if (wiiuse_init_cmd_queue(__wm[i])) {
+				WIIUSE_ERROR("Could not allocate command queue");
+				return NULL;
+			}
 		#elif defined(unix)
 			__wm[i]->bdaddr = *BDADDR_ANY;
 			__wm[i]->out_sock = -1;

wiiuse/wiiuse_internal.h

@@ -267,7 +267,7 @@ struct op_t
 } __attribute__((packed));
 
 /* not part of the api */
-void wiiuse_init_cmd_queue(struct wiimote_t *wm);
+int wiiuse_init_cmd_queue(struct wiimote_t *wm);
 void wiiuse_send_next_command(struct wiimote_t *wm);
 int wiiuse_set_report_type(struct wiimote_t* wm,cmd_blk_cb cb);
 int wiiuse_sendcmd(struct wiimote_t *wm,ubyte report_type,ubyte *msg,int len,cmd_blk_cb cb);