Changeset 2046 for Whitix

Timestamp:

04/03/09 19:06:52 (3 years ago)

Author:

mwhitworth

Message:

Fix various compiler warnings.

Files:

• Whitix/trunk/devices/misc/serial.c (modified) (6 diffs)

Whitix/trunk/devices/misc/serial.c

@@ -9 +9 @@
 #include <devices/class.h>
 #include <malloc.h>
+#include <i386/irq.h>
 #include <task.h>
 
@@ -50 +51 @@
         /* Buffer transmission */
         char* sendBuffer;
-        int sendCnt, sendHead, sendTail;
+        unsigned int sendCnt, sendHead, sendTail;
 };
 
@@ -286 +287 @@
 {
         DWORD flags;
+        int ret;
         
         if (!dev->sendBuffer)
@@ -318 +320 @@
         
         /* Register interrupt */
-        IrqAdd(dev->info->irq, SerialInterrupt, dev);
+        ret = IrqAdd(dev->info->irq, SerialInterrupt, dev);
+        
+        if (ret)
+                return ret;
         
         dev->ier = UART_IER_MSI | UART_IER_RLSI | UART_IER_RDI;
@@ -397 +402 @@
                 SerialOut(dev->info, UART_IER, dev->ier);
         }
+        
+        return 0;
 }
 
@@ -425 +432 @@
 void SerialWrite(char* str, int len)
 {
-        return SerialDevWrite(&serialDevs[0], str, len);
+        SerialDevWrite(&serialDevs[0], (BYTE*)str, len);
 }