Changeset 156 for trunk/src/os2ahci/libc.c

Timestamp:

May 6, 2013, 7:57:39 PM (12 years ago)

Author:

David Azarewicz

Message:

debugging updates

File:

• trunk/src/os2ahci/libc.c (modified) (4 diffs)

trunk/src/os2ahci/libc.c

@@ -75 +75 @@
 };
 
-/* COM port initialization sequence */
 static struct {
-  int reg;
-  u8  data;
-} com_init_sequence[] = {
-  3, 0x80,   /* overlay divisor latch register at 0x3f8 and 0x3f9 */
-  0, 0x01,   /* set low byte of divisor to 1 (115200 baud) */
-  1, 0x00,   /* set high byte of divisor to 0 */
-  3, 0x03,   /* reset divisor latch register overlay and set 8,n,1 */
-  1, 0x00,   /* disable interrupts */
-  4, 0x0f,   /* modem control register */
-  -1, 0x00
+  long Baud;
+  u16 Data;
+} BaudCodes[] = {
+  115200, 0x0001,
+  57600, 0x0002,
+  38400, 0x0003,
+  19200, 0x0006,
+  9600, 0x000C,
+  4800, 24,
+  2400, 48,
+  1200, 96,
+  600, 192,
+  300, 384,
+  0, 0 /* end of list */
 };
 
@@ -132 +135 @@
  *       to be fixed eventually...
  */
-void init_com(void)
+void init_com(long BaudRate)
 {
   int i;
-
-  if (com_base == 0) {
-    /* no com port in use */
-    return;
-  }
+  u16 RegData;
+
+  if (com_base == 0) return; /* no com port in use */
+
+  /* Find the baud code for the given baud rate */
+  for (i = 0; BaudCodes[i].Baud; i++) if (BaudCodes[i].Baud == BaudRate) break;
+  if (BaudCodes[i].Baud == 0) i = 0; /* default to 115200 */
+  RegData = BaudCodes[i].Data;
 
   spin_lock(com_lock);
 
-  for (i = 0; com_init_sequence[i].reg != -1; i++) {
-    u16 port = com_base + com_init_sequence[i].reg;
-    u8  data = com_init_sequence[i].data;
-    _asm {
-      mov  dx, port;
-      mov  al, data;
-      out  dx, al;
-    }
+  __asm {
+    mov     bx,RegData
+    mov     dx,com_base     ; Base address
+    cli
+    add     dx,3            ; Line Control (+3)
+    mov     al,10000000b    ; Set baud flag
+    out     dx,al           ; for speed setting
+
+    ; Set Baud
+    dec     dx              ; High divisor address
+    dec     dx              ; (+1)
+    mov     al,bh           ; High divisor value
+    out     dx,al           ; set it
+    dec     dx              ; Low divisor address (+0)
+    mov     al,bl           ; Low divisor value
+    out     dx,al           ; set baud rate
+
+    ; Set frame
+    mov      al,00000011b   ; Set 8 bit, none, none
+    add      dx,3           ; Line Control (+3)
+    out      dx,al
+
+    inc      dx
+    mov      al,3
+    out      dx,al          ; DTR & RTS to High
+    sti
   }
 
@@ -753 +777 @@
   ULONG start;
   ULONG end;
+  ULONG event_id;
 
   if (gis == NULL) {
@@ -762 +787 @@
   start = gis->msecs;
   end = start + millies;
+  event_id = (ULONG)&msleep;
 
   if (end < start) {
     /* wrap-around; wait until 'msecs' has wrapped, too */
     while (gis->msecs >= start) {
-      DevHelp_Yield();
+      DevHelp_ProcBlock(event_id, 1, WAIT_IS_INTERRUPTABLE);
     }
   }
 
   while (gis->msecs <= end) {
-    DevHelp_Yield();
+    DevHelp_ProcBlock(event_id, 1, WAIT_IS_INTERRUPTABLE);
   }
 }