add newline to end of dll.inc

fix unused variables and put #ifdef around redo: label in
docmil_fill_inbuf
Fix #elseif type in ipl.S to #elif (why did CPP not have sane elseif?)
This commit is contained in:
Ronald G. Minnich 2001-12-09 17:19:24 +00:00
parent 6ad1cb6448
commit ff0423c085
4 changed files with 5 additions and 3 deletions

View file

@ -12,4 +12,4 @@
.word 0x8d77 # 0x8c ~ 0x8f, .word 0x8d77 # 0x8c ~ 0x8f,
.word 0x8e01 # these values are very M/B .word 0x8e01 # these values are very M/B
.word 0x8f07 # specific .word 0x8f07 # specific
#endif /* SIS630S */ #endif /* SIS630S */

View file

@ -222,7 +222,7 @@ sis630ipl_start:
#include "unlock_flash.inc" #include "unlock_flash.inc"
#if defined(USE_DOC_MIL) || defined(USE_DOC_2000_TSOP) #if defined(USE_DOC_MIL) || defined(USE_DOC_2000_TSOP)
# include "rom/doc_mil.inc" # include "rom/doc_mil.inc"
#else defined(USE_DOC_MIL_PLUS) #elif defined(USE_DOC_MIL_PLUS)
# include "rom/doc_mil_plus.inc" # include "rom/doc_mil_plus.inc"
#endif #endif
#endif /* STD_FLASH */ #endif /* STD_FLASH */

View file

@ -72,7 +72,7 @@ static const initreg_t ide_init[] = {
void ide_fixup(void) void ide_fixup(void)
{ {
volatile int delay;
struct pci_dev *dev = pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513, struct pci_dev *dev = pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5513,
(void *) NULL); (void *) NULL);
int i; int i;

View file

@ -56,7 +56,9 @@ reset_doc()
int int
fill_inbuf(void) fill_inbuf(void)
{ {
#ifdef CHECK_DOC_MIL
redo: redo:
#endif
if (firstfill) { if (firstfill) {
// it is possible that we can get in here and the // it is possible that we can get in here and the
// doc has never been reset. So go ahead and reset it again. // doc has never been reset. So go ahead and reset it again.