15c15
< * $FreeBSD: head/sys/boot/i386/boot2/sio.S 128716 2004-04-28 14:31:44Z ru $
---
> * $FreeBSD: head/sys/boot/i386/boot2/sio.S 129240 2004-05-14 20:29:30Z ru $
18,20c18,20
< .set SIO_PRT,SIOPRT // Base port
< .set SIO_FMT,SIOFMT // 8N1
< .set SIO_DIV,(115200/SIOSPD) // 115200 / SPD
---
> .set SIO_PRT,SIOPRT # Base port
> .set SIO_FMT,SIOFMT # 8N1
> .set SIO_DIV,(115200/SIOSPD) # 115200 / SPD
30,43c30,43
< sio_init: movw $SIO_PRT+0x3,%dx // Data format reg
< movb $SIO_FMT|0x80,%al // Set format
< outb %al,(%dx) // and DLAB
< pushl %edx // Save
< subb $0x3,%dl // Divisor latch reg
< movw $SIO_DIV,%ax // Set
< outw %ax,(%dx) // BPS
< popl %edx // Restore
< movb $SIO_FMT,%al // Clear
< outb %al,(%dx) // DLAB
< incl %edx // Modem control reg
< movb $0x3,%al // Set RTS,
< outb %al,(%dx) // DTR
< incl %edx // Line status reg
---
> sio_init: movw $SIO_PRT+0x3,%dx # Data format reg
> movb $SIO_FMT|0x80,%al # Set format
> outb %al,(%dx) # and DLAB
> pushl %edx # Save
> subb $0x3,%dl # Divisor latch reg
> movw $SIO_DIV,%ax # Set
> outw %ax,(%dx) # BPS
> popl %edx # Restore
> movb $SIO_FMT,%al # Clear
> outb %al,(%dx) # DLAB
> incl %edx # Modem control reg
> movb $0x3,%al # Set RTS,
> outb %al,(%dx) # DTR
> incl %edx # Line status reg
47,50c47,50
< sio_flush.0: call sio_getc.1 // Get character
< sio_flush: call sio_ischar // Check for character
< jnz sio_flush.0 // Till none
< ret // To caller
---
> sio_flush.0: call sio_getc.1 # Get character
> sio_flush: call sio_ischar # Check for character
> jnz sio_flush.0 # Till none
> ret # To caller
54,64c54,64
< sio_putc: movw $SIO_PRT+0x5,%dx // Line status reg
< xor %ecx,%ecx // Timeout
< movb $0x40,%ch // counter
< sio_putc.1: inb (%dx),%al // Transmitter
< testb $0x20,%al // buffer empty?
< loopz sio_putc.1 // No
< jz sio_putc.2 // If timeout
< movb 0x4(%esp,1),%al // Get character
< subb $0x5,%dl // Transmitter hold reg
< outb %al,(%dx) // Write character
< sio_putc.2: ret $0x4 // To caller
---
> sio_putc: movw $SIO_PRT+0x5,%dx # Line status reg
> xor %ecx,%ecx # Timeout
> movb $0x40,%ch # counter
> sio_putc.1: inb (%dx),%al # Transmitter
> testb $0x20,%al # buffer empty?
> loopz sio_putc.1 # No
> jz sio_putc.2 # If timeout
> movb 0x4(%esp,1),%al # Get character
> subb $0x5,%dl # Transmitter hold reg
> outb %al,(%dx) # Write character
> sio_putc.2: ret $0x4 # To caller
68,72c68,72
< sio_getc: call sio_ischar // Character available?
< jz sio_getc // No
< sio_getc.1: subb $0x5,%dl // Receiver buffer reg
< inb (%dx),%al // Read character
< ret // To caller
---
> sio_getc: call sio_ischar # Character available?
> jz sio_getc # No
> sio_getc.1: subb $0x5,%dl # Receiver buffer reg
> inb (%dx),%al # Read character
> ret # To caller
76,80c76,80
< sio_ischar: movw $SIO_PRT+0x5,%dx // Line status register
< xorl %eax,%eax // Zero
< inb (%dx),%al // Received data
< andb $0x1,%al // ready?
< ret // To caller
---
> sio_ischar: movw $SIO_PRT+0x5,%dx # Line status register
> xorl %eax,%eax # Zero
> inb (%dx),%al # Received data
> andb $0x1,%al # ready?
> ret # To caller
< * $FreeBSD: head/sys/boot/i386/boot2/sio.S 128716 2004-04-28 14:31:44Z ru $
---
> * $FreeBSD: head/sys/boot/i386/boot2/sio.S 129240 2004-05-14 20:29:30Z ru $
18,20c18,20
< .set SIO_PRT,SIOPRT // Base port
< .set SIO_FMT,SIOFMT // 8N1
< .set SIO_DIV,(115200/SIOSPD) // 115200 / SPD
---
> .set SIO_PRT,SIOPRT # Base port
> .set SIO_FMT,SIOFMT # 8N1
> .set SIO_DIV,(115200/SIOSPD) # 115200 / SPD
30,43c30,43
< sio_init: movw $SIO_PRT+0x3,%dx // Data format reg
< movb $SIO_FMT|0x80,%al // Set format
< outb %al,(%dx) // and DLAB
< pushl %edx // Save
< subb $0x3,%dl // Divisor latch reg
< movw $SIO_DIV,%ax // Set
< outw %ax,(%dx) // BPS
< popl %edx // Restore
< movb $SIO_FMT,%al // Clear
< outb %al,(%dx) // DLAB
< incl %edx // Modem control reg
< movb $0x3,%al // Set RTS,
< outb %al,(%dx) // DTR
< incl %edx // Line status reg
---
> sio_init: movw $SIO_PRT+0x3,%dx # Data format reg
> movb $SIO_FMT|0x80,%al # Set format
> outb %al,(%dx) # and DLAB
> pushl %edx # Save
> subb $0x3,%dl # Divisor latch reg
> movw $SIO_DIV,%ax # Set
> outw %ax,(%dx) # BPS
> popl %edx # Restore
> movb $SIO_FMT,%al # Clear
> outb %al,(%dx) # DLAB
> incl %edx # Modem control reg
> movb $0x3,%al # Set RTS,
> outb %al,(%dx) # DTR
> incl %edx # Line status reg
47,50c47,50
< sio_flush.0: call sio_getc.1 // Get character
< sio_flush: call sio_ischar // Check for character
< jnz sio_flush.0 // Till none
< ret // To caller
---
> sio_flush.0: call sio_getc.1 # Get character
> sio_flush: call sio_ischar # Check for character
> jnz sio_flush.0 # Till none
> ret # To caller
54,64c54,64
< sio_putc: movw $SIO_PRT+0x5,%dx // Line status reg
< xor %ecx,%ecx // Timeout
< movb $0x40,%ch // counter
< sio_putc.1: inb (%dx),%al // Transmitter
< testb $0x20,%al // buffer empty?
< loopz sio_putc.1 // No
< jz sio_putc.2 // If timeout
< movb 0x4(%esp,1),%al // Get character
< subb $0x5,%dl // Transmitter hold reg
< outb %al,(%dx) // Write character
< sio_putc.2: ret $0x4 // To caller
---
> sio_putc: movw $SIO_PRT+0x5,%dx # Line status reg
> xor %ecx,%ecx # Timeout
> movb $0x40,%ch # counter
> sio_putc.1: inb (%dx),%al # Transmitter
> testb $0x20,%al # buffer empty?
> loopz sio_putc.1 # No
> jz sio_putc.2 # If timeout
> movb 0x4(%esp,1),%al # Get character
> subb $0x5,%dl # Transmitter hold reg
> outb %al,(%dx) # Write character
> sio_putc.2: ret $0x4 # To caller
68,72c68,72
< sio_getc: call sio_ischar // Character available?
< jz sio_getc // No
< sio_getc.1: subb $0x5,%dl // Receiver buffer reg
< inb (%dx),%al // Read character
< ret // To caller
---
> sio_getc: call sio_ischar # Character available?
> jz sio_getc # No
> sio_getc.1: subb $0x5,%dl # Receiver buffer reg
> inb (%dx),%al # Read character
> ret # To caller
76,80c76,80
< sio_ischar: movw $SIO_PRT+0x5,%dx // Line status register
< xorl %eax,%eax // Zero
< inb (%dx),%al // Received data
< andb $0x1,%al // ready?
< ret // To caller
---
> sio_ischar: movw $SIO_PRT+0x5,%dx # Line status register
> xorl %eax,%eax # Zero
> inb (%dx),%al # Received data
> andb $0x1,%al # ready?
> ret # To caller