[BACK]Return to mca_machdep.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / arch / i386 / mca

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/arch/i386/mca/mca_machdep.c between version 1.34 and 1.34.18.2

version 1.34, 2007/12/01 16:49:56 version 1.34.18.2, 2009/05/04 08:11:17
Line 17 
Line 17 
  * 2. Redistributions in binary form must reproduce the above copyright   * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the   *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.   *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software  
  *    must display the following acknowledgement:  
  *      This product includes software developed by the NetBSD  
  *      Foundation, Inc. and its contributors.  
  * 4. Neither the name of The NetBSD Foundation nor the names of its  
  *    contributors may be used to endorse or promote products derived  
  *    from this software without specific prior written permission.  
  *   *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS   * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED   * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
Line 85  struct bios_config {
Line 78  struct bios_config {
 #define FEATURE_DMA3    0x80    /* DMA channel 3 used by hard disk BIOS */  #define FEATURE_DMA3    0x80    /* DMA channel 3 used by hard disk BIOS */
         uint8_t         feature2;          uint8_t         feature2;
         uint8_t         pad[9];          uint8_t         pad[9];
 } __attribute__ ((packed));  } __packed;
   
 /*  /*
  * Used to encode DMA channel into ISA DMA cookie. We use upper 4 bits of   * Used to encode DMA channel into ISA DMA cookie. We use upper 4 bits of
Line 314  mca_busprobe(void)
Line 307  mca_busprobe(void)
         paddr = (regs.ES << 4) + regs.BX;          paddr = (regs.ES << 4) + regs.BX;
         scp = (struct bios_config *)ISA_HOLE_VADDR(paddr);          scp = (struct bios_config *)ISA_HOLE_VADDR(paddr);
   
         bitmask_snprintf((scp->feature2 << 8) | scp->feature1,          snprintb(buf, sizeof(buf),
                 "\20"                  "\20"
                 "\01MCA+ISA"                  "\01MCA+ISA"
                 "\02MCA"                  "\02MCA"
Line 331  mca_busprobe(void)
Line 324  mca_busprobe(void)
                 "\015MMF"                  "\015MMF"
                 "\016GPDF"                  "\016GPDF"
                 "\017KBDF"                  "\017KBDF"
                 "\020DMA32\n",                  "\020DMA32\n", (scp->feature2 << 8) | scp->feature1);
                 buf, sizeof(buf));  
   
         aprint_verbose("BIOS CFG: Model-SubM-Rev: %02x-%02x-%02x, 0x%s\n",          aprint_verbose("BIOS CFG: Model-SubM-Rev: %02x-%02x-%02x, 0x%s\n",
                 scp->model, scp->submodel, scp->bios_rev, buf);                  scp->model, scp->submodel, scp->bios_rev, buf);
Legend:
Removed from v.1.34  
changed lines
  Added in v.1.34.18.2
CVSweb <webmaster@jp.NetBSD.org>