]> git.neil.brown.name Git - history.git/commitdiff
Linux 2.2.18pre11 2.2.18pre11
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Fri, 23 Nov 2007 20:22:27 +0000 (15:22 -0500)
committerAlan Cox <alan@lxorguk.ukuu.org.uk>
Fri, 23 Nov 2007 20:22:27 +0000 (15:22 -0500)
o Kill bogus codec_id assignment (Linus Torvalds)
o Update codec init code to handle id right (Alan Cox)
o Fix dead/clashing define for NFS (Trond Myklebust)
o Remove the find_vga crap from bttv (Alan Cox)
o Fix return on probe failure for cadet (Arjan van de Ven)
o Add missing configure.help stuff from 2.4test (Alan Ford)
o Fix inia100/megaraid define clash (Arjan van de Ven)
o __xchg marked as taking volatiles (Arjan van de Ven)
o Fix vwsnd warning in sound core (Arjan van de Ven)
o wdt_pci driver should return -EIO on error (Arjan van de Ven)
o Fix init_adfs_fs warning (Arjan van de Ven)
o Fix the joystick driver option parsing (Arjan van de Ven)
o Update mkdep to handle // commenting (Mike Klar)
o Thunderlan driver typo fixes (Torben Mathiasen)
o Add KX133/KT133 stuff to the AGP/DRM  (Jeff Nguyen)
o FIx multiple card bug in eepro driver (Aristeu Filho)
o Initial YMF PCI native driver (Pete Zaitcev)
| Based on Jaroslav's ALSA driver and I've tweaked it
| a bit and maybe broken it 8)
o Fix procfs unlink bugs (Willy Tarreau)
o X.25 bugfix backport (Henner Eisen)
o Fix incorrect free_dma on DMAless boxes (Boria)
o Fix via audio driver merge (Nick Lamb)
o Update plusb driver to 2.4 one (Greg Kroah-Hartman)
o Put description info in wacom driver (Greg Kroah-Hartman)
o Update both UHCI drivers to match 2.4test (Greg Kroah-Hartman)
o Masquerade cleanup/warning fixes (Horst von Brand)

44 files changed:
Documentation/Configure.help
Makefile
drivers/char/agp/agp.h
drivers/char/agp/agpgart_be.c
drivers/char/agp/agpgart_fe.c
drivers/char/bttv.c
drivers/char/drm/agpsupport.c
drivers/char/radio-cadet.c
drivers/char/wdt_pci.c
drivers/net/eepro.c
drivers/net/tlan.c
drivers/scsi/inia100.h
drivers/sound/Config.in
drivers/sound/Makefile
drivers/sound/ac97_codec.c
drivers/sound/sound_core.c
drivers/sound/via82cxxx_audio.c
drivers/sound/ymfpci.c [new file with mode: 0644]
drivers/sound/ymfpci.h [new file with mode: 0644]
drivers/sound/ymfpci_image.h [new file with mode: 0644]
drivers/usb/plusb.c
drivers/usb/uhci.c
drivers/usb/usb-uhci.c
drivers/usb/wacom.c
fs/filesystems.c
fs/lockd/xdr.c
fs/lockd/xdr4.c
fs/proc/root.c
include/asm-i386/system.h
include/linux/ac97_codec.h
include/linux/agp_backend.h
include/linux/joystick.h
include/linux/kernel.h
include/linux/nfsd/const.h
include/linux/pci.h
include/net/x25.h
kernel/dma.c
net/ipv4/ip_masq_irc.c
net/ipv4/ip_masq_user.c
net/sunrpc/xdr.c
net/x25/af_x25.c
net/x25/x25_dev.c
net/x25/x25_out.c
scripts/mkdep.c

index bb172d2068d209e3220e14c7c756943cf768358f..e8f2160bdeaa59d7a4094452b4e86f754af32f99 100644 (file)
@@ -663,6 +663,13 @@ CMD646 chipset support (EXPERIMENTAL)
 CONFIG_BLK_DEV_CMD646
   Say Y here if you have an IDE controller like this.
 
+Cyrix CS5530 MediaGX chipset support
+CONFIG_BLK_DEV_CS5530
+  Include support for UDMA on the Cyrix MediaGX 5530 chipset. This
+  will automatically be detected and configured if found.
+
+  It is safe to say Y to this question.
+
 QDI QD6580 support
 CONFIG_BLK_DEV_QD6580
   This driver is enabled at runtime using the "ide0=qd6580" kernel
@@ -1461,6 +1468,61 @@ SGI Visual Workstation framebuffer support
 CONFIG_FB_SGIVW
   SGI Visual Workstation support for framebuffer graphics.
 
+I2O support
+CONFIG_I2O
+  The Intelligent Input/Output (I2O) architecture allows hardware
+  drivers to be split into two parts: an operating system specific
+  module called the OSM and an hardware specific module called the
+  HDM. The OSM can talk to a whole range of HDM's, and ideally the
+  HDM's are not OS dependent. This allows for the same HDM driver to
+  be used under different operating systems if the relevant OSM is in
+  place. In order for this to work, you need to have an I2O interface
+  adapter card in your computer. This card contains a special I/O
+  processor (IOP), thus allowing high speeds since the CPU does not
+  have to deal with I/O.
+
+  If you say Y here, you will get a choice of interface adapter
+  drivers and OSM's with the following questions.
+
+  This support is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  If you want to compile it as a module, say M here and read
+  Documentation/modules.txt. You will get modules called i2o_core.o
+  and i20_config.o. 
+
+  If unsure, say N.
+
+I2O PCI support
+CONFIG_I2O_PCI
+  Say Y for support of PCI bus I2O interface adapters. Currently this
+  is the only variety supported, so you should say Y.
+
+  This support is also available as a module called i2o_pci.o ( = code
+  which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+I2O Block OSM
+CONFIG_I2O_BLOCK
+  Include support for the I2O Block OSM. The Block OSM presents disk
+  and other structured block devices to the operating system.
+
+  This support is also available as a module called i2o_block.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
+I2O SCSI OSM
+CONFIG_I2O_SCSI
+  Allows direct SCSI access to SCSI devices on a SCSI or FibreChannel
+  I2O controller. You can use both the SCSI and Block OSM together if
+  you wish.
+
+  This support is also available as a module called i2o_scsi.o ( =
+  code which can be inserted in and removed from the running kernel
+  whenever you want). If you want to compile it as a module, say M
+  here and read Documentation/modules.txt.
+
 System V IPC
 CONFIG_SYSVIPC
   Inter Process Communication is a suite of library functions and
@@ -9942,6 +10004,33 @@ CONFIG_FT_FDC_MAX_RATE
   speed. If unsure, leave this disabled, i.e. leave it at 2000
   bits/sec.
 
+Direct Rendering Manager (XFree86 DRI support)
+CONFIG_DRM
+  Kernel-level support for the Direct Rendering Infrastructure (DRI)
+  introduced in XFree86 4.x. These modules provide support for
+  synchronization, security, and DMA transfers. Select the module that
+  provides support for your graphics card.
+
+3dfx Banshee/Voodoo3+
+CONFIG_DRM_TDFX
+  Choose M here if you have a 3dfx Banshee/Voodoo3 graphics card.
+
+3dlabs GMX 2000
+CONFIG_DRM_GAMMA
+  Choose M here if you have a 3dlabs GMX 2000 graphics card.
+
+ATI Rage 128
+CONFIG_DRM_R128
+  Choose M here if you have a ATI Rage 128 graphics card.
+
+Intel I810
+CONFIG_DRM_I810
+  Choose M here if you have an Intel I810 AGP graphics card.
+
+Matrox g200/g400
+CONFIG_DRM_MGA
+  Choose M here if you have a Matrox g200/g400 AGP graphics card.
+
 MTRR control and configuration
 CONFIG_MTRR
   On Intel P6 family processors (Pentium Pro, Pentium II and later)
@@ -10310,6 +10399,60 @@ CONFIG_AGP
   Consult the output of lspci, your motherboard manual, or the inside
   of your computer if unsure what to choose. Multiple selections are ok.
 
+Intel 440LX/BX/GX support
+CONFIG_AGP_INTEL
+  This option give you AGP support for the GLX component of the
+  "soon to be released" XFree86-4 on Intel 440LX/BX/GX chipsets.
+
+  For the moment, most people should say no, unless you want to
+  test the GLX component which can be downloaded from
+       http://glx.on.openprojects.net/
+
+Intel I810/I810 DC100/I810e support
+CONFIG_AGP_I810
+  This option give you AGP support for the Xserver for the intel
+  810 chipset boards. This is required to do any useful video
+  modes.
+
+VIA VP3/MVP3/Apollo Pro support
+CONFIG_AGP_VIA
+  This option give you AGP support for the GLX component of the
+  "soon to be released" XFree86-4 on VIA MPV3/Apollo Pro chipsets.
+
+  For the moment, most people should say no, unless you want to
+  test the GLX component which can be downloaded from
+       http://glx.on.openprojects.net/
+
+AMD Irongate support
+CONFIG_AGP_AMD
+  This option give you AGP support for the GLX component of the
+  "soon to be released" XFree86-4 on Intel AMD Irongate chipset.
+
+  For the moment, most people should say no, unless you want to
+  test the GLX component which can be downloaded from
+       http://glx.on.openprojects.net/
+
+Generic SiS support
+CONFIG_AGP_SIS
+  This option give you AGP support for the GLX component of the
+  "soon to be released" XFree86-4 on Silicon Integrated Systems [SiS]
+  chipsets.
+
+  Note than 5591/5592 AGP chipsets are NOT supported.
+
+  For the moment, most people should say no, unless you want to
+  test the GLX component which can be downloaded from
+       http://glx.on.openprojects.net/
+
+ALI M1541 support
+CONFIG_AGP_ALI
+  This option give you AGP support for the GLX component of the
+  "soon to be released" XFree86-4 on ALI M1541 chipset.
+
+  For the moment, most people should say no, unless you want to
+  test the GLX component which can be downloaded from
+       http://glx.on.openprojects.net/
+
 Tadpole ANA H8 Support
 CONFIG_H8
   The Hitachi H8/337 is a microcontroller used to deal with the power
index 2119620beeeb3526867e1f90b683f93f7aef9710..958db18579f06fcd48bdda734f8ecbcc14145d5e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 18
-EXTRAVERSION = pre10
+EXTRAVERSION = pre11
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
index fdc1b4186788613b7f6de2437f7c72b7579cc5a3..7ceb3090e470f9717c7f06bed0e816e08bbf746b 100644 (file)
@@ -214,6 +214,12 @@ struct agp_bridge_data {
 #ifndef PCI_DEVICE_ID_VIA_8501_0
 #define PCI_DEVICE_ID_VIA_8501_0       0x0501
 #endif
+#ifndef PCI_DEVICE_ID_VIA_8371_0
+#define PCI_DEVICE_ID_VIA_8371_0       0x0391
+#endif
+#ifndef PCI_DEVICE_ID_VIA_8363_0
+#define PCI_DEVICE_ID_VIA_8363_0       0x0305
+#endif
 
 
 /* intel register */
index 2adc7a9d250686c6d4821b99527580f9073c118b..4d96e96461ec5f34e4e95100cf4bb6e25dc649cd 100644 (file)
@@ -43,7 +43,7 @@
 #include <asm/io.h>
 #include <asm/page.h>
 
-#include "agp_backend.h"
+#include <linux/agp_backend.h>
 #include "agp.h"
 
 MODULE_AUTHOR("Jeff Hartmann <jhartmann@precisioninsight.com>");
@@ -2118,9 +2118,15 @@ static struct {
                via_generic_setup },
        { PCI_DEVICE_ID_VIA_8371_0,
                PCI_VENDOR_ID_VIA,
-               VIA_APOLLO_SUPER,
+               VIA_APOLLO_KX133,
                "Via",
-               "Apollo Super",
+               "Apollo KX133",
+               via_generic_setup },
+       { PCI_DEVICE_ID_VIA_8363_0,
+               PCI_VENDOR_ID_VIA,
+               VIA_APOLLO_KT133,
+               "Via",
+               "Apollo KT133",
                via_generic_setup },
        { PCI_DEVICE_ID_VIA_82C691_0,
                PCI_VENDOR_ID_VIA,
index 9b2c830198345cdc06779c048d32a3381d92a902..019b59ceff37bc810c6269de8ff736032b9f38d1 100644 (file)
@@ -39,7 +39,7 @@
 #include <linux/init.h>
 #include <linux/pagemap.h>
 #include <linux/miscdevice.h>
-#include "agp_backend.h"
+#include <linux/agp_backend.h>
 #include "agpgart.h"
 #include <asm/system.h>
 #include <asm/uaccess.h>
index a093ef5d23b8c19b5028c948df7758326a79797a..a09457cb0931dd369b9e460a8c20020b9a94f445 100644 (file)
@@ -95,7 +95,6 @@ MODULE_PARM(pll,"1-4i");
 /* Anybody who uses more than four? */
 #define BTTV_MAX 4
 
-static int find_vga(void);
 static void bt848_set_risc_jmps(struct bttv *btv);
 
 static unsigned int vidmem=0;   /* manually set video mem address */
@@ -1663,8 +1662,6 @@ static int bttv_open(struct video_device *dev, int flags)
         audio(btv, AUDIO_UNMUTE);
         for (i=users=0; i<bttv_num; i++)
                 users+=bttvs[i].user;
-        if (users==0)
-                find_vga();
         btv->fbuffer=NULL;
         if (!btv->fbuffer)
                 btv->fbuffer=(unsigned char *) rvmalloc(2*BTTV_MAX_FBUF);
@@ -2673,234 +2670,6 @@ static struct video_device radio_template=
 };
 
 
-struct vidbases 
-{
-       unsigned short vendor, device;
-       char *name;
-       uint badr;
-};
-
-static struct vidbases vbs[] = {
-        { PCI_VENDOR_ID_ALLIANCE, PCI_DEVICE_ID_ALLIANCE_AT3D,
-                "Alliance AT3D", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_215CT222,
-                "ATI MACH64 CT", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_210888GX,
-               "ATI MACH64 Winturbo", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_215GT,
-                "ATI MACH64 GT", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_CIRRUS, 0, "Cirrus Logic", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TGA,
-               "DEC DC21030", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL,
-               "Matrox Millennium", PCI_BASE_ADDRESS_1},
-       { PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL_2,
-               "Matrox Millennium II", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL_2_AGP,
-               "Matrox Millennium II AGP", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_MATROX, 0x051a, "Matrox Mystique", PCI_BASE_ADDRESS_1},
-       { PCI_VENDOR_ID_MATROX, 0x0521, "Matrox G200", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_N9, PCI_DEVICE_ID_N9_I128, 
-               "Number Nine Imagine 128", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_N9, PCI_DEVICE_ID_N9_I128_2, 
-               "Number Nine Imagine 128 Series 2", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_S3, 0, "S3", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_TSENG, 0, "TSENG", PCI_BASE_ADDRESS_0},
-       { PCI_VENDOR_ID_NVIDIA_SGS, PCI_DEVICE_ID_NVIDIA_SGS_RIVA128,
-                "Riva128", PCI_BASE_ADDRESS_1},
-};
-
-
-/* DEC TGA offsets stolen from XFree-3.2 */
-
-static uint dec_offsets[4] = {
-       0x200000,
-       0x804000,
-       0,
-       0x1004000
-};
-
-#define NR_CARDS (sizeof(vbs)/sizeof(struct vidbases))
-
-/* Scan for PCI display adapter
-   if more than one card is present the last one is used for now */
-
-#if LINUX_VERSION_CODE >= 0x020100
-
-static int find_vga(void)
-{
-       unsigned short badr;
-       int found = 0, i, tga_type;
-       unsigned int vidadr=0;
-       struct pci_dev *dev;
-
-
-       for (dev = pci_devices; dev != NULL; dev = dev->next) 
-       {
-               if (dev->class != PCI_CLASS_NOT_DEFINED_VGA &&
-                       ((dev->class) >> 16 != PCI_BASE_CLASS_DISPLAY))
-               {
-                       continue;
-               }
-               if (PCI_FUNC(dev->devfn) != 0)
-                       continue;
-
-               badr=0;
-               printk(KERN_INFO "bttv: PCI display adapter: ");
-               for (i=0; i<NR_CARDS; i++) 
-               {
-                       if (dev->vendor == vbs[i].vendor) 
-                       {
-                               if (vbs[i].device) 
-                                       if (vbs[i].device!=dev->device)
-                                               continue;
-                               printk("%s.\n", vbs[i].name);
-                               badr=vbs[i].badr;
-                               break;
-                       }
-               }
-               if (!badr) 
-               {
-                       printk(KERN_ERR "bttv: Unknown video memory base address.\n");
-                       continue;
-               }
-               pci_read_config_dword(dev, badr, &vidadr);
-               if (vidadr & PCI_BASE_ADDRESS_SPACE_IO) 
-               {
-                       printk(KERN_ERR "bttv: Memory seems to be I/O memory.\n");
-                       printk(KERN_ERR "bttv: Check entry for your card type in bttv.c vidbases struct.\n");
-                       continue;
-               }
-               vidadr &= PCI_BASE_ADDRESS_MEM_MASK;
-               if (!vidadr) 
-               {
-                       printk(KERN_ERR "bttv: Memory @ 0, must be something wrong!");
-                       continue;
-               }
-     
-               if (dev->vendor == PCI_VENDOR_ID_DEC &&
-                       dev->device == PCI_DEVICE_ID_DEC_TGA) 
-               {
-                       tga_type = (readl((unsigned long)vidadr) >> 12) & 0x0f;
-                       if (tga_type != 0 && tga_type != 1 && tga_type != 3) 
-                       {
-                               printk(KERN_ERR "bttv: TGA type (0x%x) unrecognized!\n", tga_type);
-                               found--;
-                       }
-                       vidadr+=dec_offsets[tga_type];
-               }
-               DEBUG(printk(KERN_DEBUG "bttv: memory @ 0x%08x, ", vidadr));
-               DEBUG(printk(KERN_DEBUG "devfn: 0x%04x.\n", dev->devfn));
-               found++;
-       }
-  
-       if (vidmem)
-       {
-               vidadr=vidmem<<20;
-               printk(KERN_INFO "bttv: Video memory override: 0x%08x\n", vidadr);
-               found=1;
-       }
-       for (i=0; i<BTTV_MAX; i++)
-               bttvs[i].win.vidadr=vidadr;
-
-       return found;
-}
-
-#else
-static int find_vga(void)
-{
-       unsigned int devfn, class, vendev;
-       unsigned short vendor, device, badr;
-       int found=0, bus=0, i, tga_type;
-       unsigned int vidadr=0;
-
-
-       for (devfn = 0; devfn < 0xff; devfn++) 
-       {
-               if (PCI_FUNC(devfn) != 0)
-                       continue;
-               pcibios_read_config_dword(bus, devfn, PCI_VENDOR_ID, &vendev);
-               if (vendev == 0xffffffff || vendev == 0x00000000) 
-                       continue;
-               pcibios_read_config_word(bus, devfn, PCI_VENDOR_ID, &vendor);
-               pcibios_read_config_word(bus, devfn, PCI_DEVICE_ID, &device);
-               pcibios_read_config_dword(bus, devfn, PCI_CLASS_REVISION, &class);
-               class = class >> 16;
-/*             if (class == PCI_CLASS_DISPLAY_VGA) {*/
-               if ((class>>8) == PCI_BASE_CLASS_DISPLAY ||
-                       /* Number 9 GXE64Pro needs this */
-                       class == PCI_CLASS_NOT_DEFINED_VGA) 
-               {
-                       badr=0;
-                       printk(KERN_INFO "bttv: PCI display adapter: ");
-                       for (i=0; i<NR_CARDS; i++) 
-                       {
-                               if (vendor==vbs[i].vendor) 
-                               {
-                                       if (vbs[i].device) 
-                                               if (vbs[i].device!=device)
-                                                       continue;
-                                       printk("%s.\n", vbs[i].name);
-                                       badr=vbs[i].badr;
-                                       break;
-                               }
-                       }
-                        if (NR_CARDS == i)
-                            printk("UNKNOWN.\n");
-                       if (!badr) 
-                       {
-                               printk(KERN_ERR "bttv: Unknown video memory base address.\n");
-                               continue;
-                       }
-                       pcibios_read_config_dword(bus, devfn, badr, &vidadr);
-                       if (vidadr & PCI_BASE_ADDRESS_SPACE_IO) 
-                       {
-                               printk(KERN_ERR "bttv: Memory seems to be I/O memory.\n");
-                               printk(KERN_ERR "bttv: Check entry for your card type in bttv.c vidbases struct.\n");
-                               continue;
-                       }
-                       vidadr &= PCI_BASE_ADDRESS_MEM_MASK;
-                       if (!vidadr) 
-                       {
-                               printk(KERN_ERR "bttv: Memory @ 0, must be something wrong!\n");
-                               continue;
-                       }
-      
-                       if (vendor==PCI_VENDOR_ID_DEC)
-                               if (device==PCI_DEVICE_ID_DEC_TGA) 
-                       {
-                               tga_type = (readl((unsigned long)vidadr) >> 12) & 0x0f;
-                               if (tga_type != 0 && tga_type != 1 && tga_type != 3) 
-                               {
-                                       printk(KERN_ERR "bttv: TGA type (0x%x) unrecognized!\n", tga_type);
-                                       found--;
-                               }
-                               vidadr+=dec_offsets[tga_type];
-                       }
-
-                       DEBUG(printk(KERN_DEBUG "bttv: memory @ 0x%08x, ", vidadr));
-                       DEBUG(printk(KERN_DEBUG "devfn: 0x%04x.\n", devfn));
-                       found++;
-               }
-       }
-  
-       if (vidmem)
-       {
-                if (vidmem < 0x1000)
-                        vidadr=vidmem<<20;
-                else
-                        vidadr=vidmem;
-               printk(KERN_INFO "bttv: Video memory override: 0x%08x\n", vidadr);
-               found=1;
-       }
-       for (i=0; i<BTTV_MAX; i++)
-               bttvs[i].win.vidadr=vidadr;
-
-       return found;
-}
-#endif
-
-
 #define  TRITON_PCON              0x50 
 #define  TRITON_BUS_CONCURRENCY   (1<<0)
 #define  TRITON_STREAMING        (1<<1)
@@ -2908,8 +2677,6 @@ static int find_vga(void)
 #define  TRITON_PEER_CONCURRENCY  (1<<3)
   
 
-#if LINUX_VERSION_CODE >= 0x020100
-
 static void handle_chipset(void)
 {
        struct pci_dev *dev = NULL;
@@ -2973,78 +2740,6 @@ static void handle_chipset(void)
 #endif
        }
 }
-#else
-static void handle_chipset(void)
-{
-       int index;
-  
-       for (index = 0; index < 8; index++)
-       {
-               unsigned char bus, devfn;
-               unsigned char b;
-    
-               /* Beware the SiS 85C496 my friend - rev 49 don't work with a bttv */
-               
-               if (!pcibios_find_device(PCI_VENDOR_ID_SI, 
-                                        PCI_DEVICE_ID_SI_496, 
-                                        index, &bus, &devfn))
-               {
-                       printk(KERN_WARNING "BT848 and SIS 85C496 chipset don't always work together.\n");
-               }                       
-
-               if (!pcibios_find_device(PCI_VENDOR_ID_INTEL, 
-                                        PCI_DEVICE_ID_INTEL_82441,
-                                        index, &bus, &devfn)) 
-               {
-                       pcibios_read_config_byte(bus, devfn, 0x53, &b);
-                       DEBUG(printk(KERN_INFO "bttv: Host bridge: 82441FX Natoma, "));
-                       DEBUG(printk("bufcon=0x%02x\n",b));
-               }
-
-               if (!pcibios_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82437,
-                           index, &bus, &devfn)) 
-               {
-                       printk(KERN_INFO "bttv: Host bridge 82437FX Triton PIIX\n");
-                       triton1=BT848_INT_ETBF;
-                       
-#if 0                  
-                       /* The ETBF bit SHOULD make all this unnecessary */
-                       /* 430FX (Triton I) freezes with bus concurrency on -> switch it off */
-                       {   
-                               unsigned char bo;
-
-                               pcibios_read_config_byte(bus, devfn, TRITON_PCON, &b);
-                               bo=b;
-                               DEBUG(printk(KERN_DEBUG "bttv: 82437FX: PCON: 0x%x\n",b));
-
-                               if(!(b & TRITON_BUS_CONCURRENCY)) 
-                               {
-                                       printk(KERN_WARNING "bttv: 82437FX: disabling bus concurrency\n");
-                                       b |= TRITON_BUS_CONCURRENCY;
-                               }
-
-                               if(b & TRITON_PEER_CONCURRENCY) 
-                               {
-                                       printk(KERN_WARNING "bttv: 82437FX: disabling peer concurrency\n");
-                                       b &= ~TRITON_PEER_CONCURRENCY;
-                               }
-                               if(!(b & TRITON_STREAMING)) 
-                               {
-                                       printk(KERN_WARNING "bttv: 82437FX: disabling streaming\n");
-                                       b |=  TRITON_STREAMING;
-                               }
-
-                               if (b!=bo) 
-                               {
-                                       pcibios_write_config_byte(bus, devfn, TRITON_PCON, b); 
-                                       printk(KERN_DEBUG "bttv: 82437FX: PCON changed to: 0x%x\n",b);
-                               }
-                       }
-#endif
-               }
-       }
-}
-#endif
 
 static void init_tea6300(struct i2c_bus *bus) 
 {
index e1e1ccedddf09d64ff8bccd142b72f3778548ca5..68f14a7aeb46646923d07d1c396231da9b115ecf 100644 (file)
@@ -298,7 +298,8 @@ drm_agp_head_t *drm_agp_init(void)
                case VIA_VP3:          head->chipset = "VIA VP3";          break;
                case VIA_MVP3:         head->chipset = "VIA MVP3";         break;
                case VIA_APOLLO_PRO:   head->chipset = "VIA Apollo Pro";   break;
-               case VIA_APOLLO_SUPER: head->chipset = "VIA Apollo Super"; break;
+               case VIA_APOLLO_KX133: head->chipset = "VIA Apollo KX133"; break;
+               case VIA_APOLLO_KT133: head->chipset = "VIA Apollo KT133"; break;
                case SIS_GENERIC:      head->chipset = "SiS";              break;
                case AMD_GENERIC:      head->chipset = "AMD";              break;
                case AMD_IRONGATE:     head->chipset = "AMD Irongate";     break;
index 7404083be2bf16b9b79ed49a56028bcc188d940b..804b418f73fa700de3a9369bdd6b90fbc608427c 100644 (file)
@@ -548,7 +548,7 @@ __initfunc(int cadet_init(struct video_init *v))
 {
 #ifndef MODULE        
         if(cadet_probe()<0) {
-               return EINVAL;
+               return -EINVAL;
        }
 #endif
        if(video_register_device(&cadet_radio,VFL_TYPE_RADIO)==-1)
index 224c18cfc9b958129137a966af0fe06f7d9da92a..2718f48371b372f854ae1aee2380b63907d3adfb 100644 (file)
@@ -499,6 +499,7 @@ static int __init wdtpci_init_one (struct pci_dev *dev)
 
 err_out_free_res:
        release_region (io, 16);
+       return -EIO;
 }
 
 
index 42f5be4f86e1ab7fca598f3e43ecd63a06e839c4..2c9ca0f5ae3ddcb1de05c73bbf9d8bf9b5a40256 100644 (file)
@@ -23,6 +23,8 @@
        This is a compatibility hardware problem.
 
        Versions:
+       0.12c   fixed other multiple cards bug and other cleanups
+               (aris, 08/21/2000)
        0.12b   added reset when the tx interrupt is called and TX isn't done
                and other minor fixes. this may fix a problem found after
                initialization that delays tx until a transmit timeout is 
@@ -212,6 +214,12 @@ struct eepro_local {
                                   version of the 82595 chip. */
        int stepping;
        spinlock_t lock; /* Serializing lock  */ 
+       unsigned rcv_ram;
+       unsigned rcv_start;
+       unsigned xmt_bar;
+       unsigned xmt_lower_limit_reg;
+       unsigned xmt_upper_limit_reg;
+       unsigned eeprom_reg;
 };
 
 /* The station (ethernet) address prefix, used for IDing the board. */
@@ -356,24 +364,20 @@ buffer (transmit-buffer = 32K - receive-buffer).
 
 #define        RCV_HEADER      8
 #define RCV_DEFAULT_RAM        0x6000
-#define RCV_RAM        rcv_ram
-
-static unsigned rcv_ram = RCV_DEFAULT_RAM;
+#define RCV_RAM        lp->rcv_ram
 
 #define XMT_HEADER     8
 #define XMT_RAM                (RAM_SIZE - RCV_RAM)
 
-#define XMT_START      ((rcv_start + RCV_RAM) % RAM_SIZE)
+#define XMT_START      ((lp->rcv_start + RCV_RAM) % RAM_SIZE)
 
-#define RCV_LOWER_LIMIT        (rcv_start >> 8)
-#define RCV_UPPER_LIMIT        (((rcv_start + RCV_RAM) - 2) >> 8)
+#define RCV_LOWER_LIMIT        (lp->rcv_start >> 8)
+#define RCV_UPPER_LIMIT        (((lp->rcv_start + RCV_RAM) - 2) >> 8)
 #define XMT_LOWER_LIMIT        (XMT_START >> 8)
 #define XMT_UPPER_LIMIT        (((XMT_START + XMT_RAM) - 2) >> 8)
 
 #define RCV_START_PRO  0x00
 #define RCV_START_10   XMT_RAM
-                                       /* by default the old driver */
-static unsigned rcv_start = RCV_START_PRO;
 
 #define        RCV_DONE        0x0008
 #define        RX_OK           0x2000
@@ -422,7 +426,6 @@ static unsigned rcv_start = RCV_START_PRO;
 
 #define        XMT_BAR_PRO     0x0a
 #define        XMT_BAR_10      0x0b
-static unsigned xmt_bar = XMT_BAR_PRO;
 
 #define        HOST_ADDRESS_REG        0x0c
 #define        IO_PORT         0x0e
@@ -440,8 +443,6 @@ static unsigned xmt_bar = XMT_BAR_PRO;
 #define        XMT_UPPER_LIMIT_REG_PRO 0x0b
 #define        XMT_LOWER_LIMIT_REG_10  0x0b
 #define        XMT_UPPER_LIMIT_REG_10  0x0a
-static unsigned xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_PRO;
-static unsigned xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_PRO;
 
 /* Bank 2 registers */
 #define        XMT_Chain_Int   0x20    /* Interrupt at the end of the transmit chain */
@@ -466,7 +467,6 @@ static unsigned xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_PRO;
 
 #define EEPROM_REG_PRO 0x0a
 #define EEPROM_REG_10  0x0b
-static unsigned eeprom_reg = EEPROM_REG_PRO;
 
 #define EESK 0x01
 #define EECS 0x02
@@ -528,7 +528,8 @@ static unsigned eeprom_reg = EEPROM_REG_PRO;
 #define eepro_ack_tx(ioaddr) outb (TX_INT, ioaddr + STATUS_REG)
 
 /* a complete sel reset */
-#define eepro_complete_selreset(ioaddr) {      eepro_dis_int(ioaddr);\
+#define eepro_complete_selreset(ioaddr) {      \
+                                               /* eepro_dis_int(ioaddr); */ \
                                                lp->stats.tx_errors++;\
                                                eepro_sel_reset(ioaddr);\
                                                lp->tx_end = \
@@ -537,7 +538,7 @@ static unsigned eeprom_reg = EEPROM_REG_PRO;
                                                lp->tx_last = 0;\
                                                dev->tbusy=0;\
                                                dev->trans_start = jiffies;\
-                                               eepro_en_int(ioaddr);\
+                                               /*eepro_en_int(ioaddr); */ \
                                                eepro_en_rx(ioaddr);\
                                        }
 
@@ -670,7 +671,15 @@ int eepro_probe1(struct device *dev, short ioaddr)
 
                        lp = (struct eepro_local *)dev->priv;
 
-                       /* Now, get the ethernet hardware address from
+                       /* default values */
+                       lp->rcv_start = RCV_START_PRO;
+                       lp->xmt_bar = XMT_BAR_PRO;
+                       lp->xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_PRO;
+                       lp->xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_PRO;
+                       lp->eeprom_reg = EEPROM_REG_PRO;
+                       lp->rcv_ram = RCV_DEFAULT_RAM;
+
+               /* Now, get the ethernet hardware address from
                           the EEPROM */
 
                        station_addr[0] = read_eeprom(ioaddr, 2, dev);
@@ -682,18 +691,18 @@ int eepro_probe1(struct device *dev, short ioaddr)
                            station_addr[0] == 0xffff) {
                                eepro = 3;
                                lp->eepro = LAN595FX_10ISA;
-                               eeprom_reg = EEPROM_REG_10;
-                               rcv_start = RCV_START_10;
-                               xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_10;
-                               xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_10;
+                               lp->eeprom_reg = EEPROM_REG_10;
+                               lp->rcv_start = RCV_START_10;
+                               lp->xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_10;
+                               lp->xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_10;
+                               lp->xmt_bar = XMT_BAR_10;
 
                                station_addr[0] = read_eeprom(ioaddr, 2, dev);
                        }
-                       
+
                        station_addr[1] = read_eeprom(ioaddr, 3, dev);
                        station_addr[2] = read_eeprom(ioaddr, 4, dev);
 
-
                        if (eepro) {
                                printk("%s: Intel EtherExpress 10 ISA\n at %#x,",
                                        dev->name, ioaddr);
@@ -729,7 +738,7 @@ int eepro_probe1(struct device *dev, short ioaddr)
                        else {
                                dev->mem_end = (dev->mem_end * 1024) +
                                                        (RCV_LOWER_LIMIT << 8);
-                               rcv_ram = dev->mem_end - (RCV_LOWER_LIMIT << 8);
+                               lp->rcv_ram = dev->mem_end - (RCV_LOWER_LIMIT << 8);
                        }
 
                        /* From now on, dev->mem_end - dev->mem_start contains 
@@ -939,7 +948,7 @@ static int eepro_open(struct device *dev)
        /* Initialize the 82595. */
 
        eepro_sw2bank2(ioaddr); /* be CAREFUL, BANK 2 now */
-       temp_reg = inb(ioaddr + eeprom_reg);
+       temp_reg = inb(ioaddr + lp->eeprom_reg);
 
        lp->stepping = temp_reg >> 5;   /* Get the stepping number of the 595 */
        /* Get the stepping number of the 595 */
@@ -948,7 +957,7 @@ static int eepro_open(struct device *dev)
                printk(KERN_DEBUG "The stepping of the 82595 is %d\n", lp->stepping);
 
        if (temp_reg & 0x10) /* Check the TurnOff Enable bit */
-               outb(temp_reg & 0xef, ioaddr + eeprom_reg);
+               outb(temp_reg & 0xef, ioaddr + lp->eeprom_reg);
        for (i=0; i < 6; i++) /* Fill the mac address */
                outb(dev->dev_addr[i] , ioaddr + I_ADD_REG0 + i);
                        
@@ -983,8 +992,8 @@ static int eepro_open(struct device *dev)
        /* Initialize the RCV and XMT upper and lower limits */
        outb(RCV_LOWER_LIMIT, ioaddr + RCV_LOWER_LIMIT_REG); 
        outb(RCV_UPPER_LIMIT, ioaddr + RCV_UPPER_LIMIT_REG); 
-       outb(XMT_LOWER_LIMIT, ioaddr + xmt_lower_limit_reg); 
-       outb(XMT_UPPER_LIMIT, ioaddr + xmt_upper_limit_reg); 
+       outb(XMT_LOWER_LIMIT, ioaddr + lp->xmt_lower_limit_reg); 
+       outb(XMT_UPPER_LIMIT, ioaddr + lp->xmt_upper_limit_reg); 
 
        /* Enable the interrupt line. */
        eepro_en_intline(ioaddr);
@@ -1003,7 +1012,7 @@ static int eepro_open(struct device *dev)
        outw(((RCV_UPPER_LIMIT << 8) | 0xfe), ioaddr + RCV_STOP); 
 
        /* Initialize XMT */
-       outw((XMT_LOWER_LIMIT << 8), ioaddr + xmt_bar); 
+       outw((XMT_LOWER_LIMIT << 8), ioaddr + lp->xmt_bar); 
 
        /* Check for the i82595TX and i82595FX */
        old8 = inb(ioaddr + 8);
@@ -1174,7 +1183,6 @@ eepro_interrupt(int irq, void *dev_id, struct pt_regs * regs)
                                break;
                        case TX_INT:
                                eepro_ack_tx(ioaddr);
-                               break;
                }
                if (status & RX_INT) {
                        if (net_debug > 4)
@@ -1330,7 +1338,7 @@ set_multicast_list(struct device *dev)
                outw(eaddrs[0], ioaddr + IO_PORT);
                outw(eaddrs[1], ioaddr + IO_PORT);
                outw(eaddrs[2], ioaddr + IO_PORT);
-               outw(lp->tx_end, ioaddr + xmt_bar);
+               outw(lp->tx_end, ioaddr + lp->xmt_bar);
                outb(MC_SETUP, ioaddr);
 
                /* Update the transmit queue */
@@ -1392,8 +1400,8 @@ read_eeprom(int ioaddr, int location, struct device *dev)
 {
        int i;
        unsigned short retval = 0;
-       short ee_addr = ioaddr + eeprom_reg;
        struct eepro_local *lp = (struct eepro_local *)dev->priv;
+       short ee_addr = ioaddr + lp->eeprom_reg;
        int read_cmd = location | EE_READ_CMD;
        short ctrl_val = EECS ;
        
@@ -1512,7 +1520,7 @@ hardware_send_packet(struct device *dev, void *buf, short length)
                status = inw(ioaddr + IO_PORT); 
 
                if (lp->tx_start == lp->tx_end) {
-                       outw(last, ioaddr + xmt_bar);
+                       outw(last, ioaddr + lp->xmt_bar);
                        outb(XMT_CMD, ioaddr);                  
                        lp->tx_start = last;   /* I don't like to change tx_start here */
                }
index 60001bd7523ed4fb2760f6a87ccfed6f8f92eba3..b2cb51d6930c1bf89fcb33076e59debdb2c7b197 100644 (file)
@@ -57,6 +57,8 @@
  *
  *     v1.3b June 28, 2000     - Clean ups.
  *
+ *     v1.3c Sep 7, 2000       - Minor typo fix.
+ *
  ********************************************************************************/
 
 
@@ -81,7 +83,7 @@ static        int             TLanDevicesInstalled = 0;
 static int             aui = 0;
 static int             duplex = 0;
 static int             speed = 0;
-static const char *tlan_banner = "ThunderLAN driver v1.3b\n";
+static const char *tlan_banner = "ThunderLAN driver v1.3c\n";
 
 MODULE_AUTHOR("Maintainer: Torben Mathiasen <torben.mathiasen@compaq.com>");
 MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet adapters");
@@ -510,7 +512,7 @@ extern int tlan_probe( struct device *dev )
        }
        priv->debug =      dev->mem_end;
 
-       printk(KERN_INFO "TLAN 1.3b: %s irq=%2d io=%04x, %s, Rev. %d\n",
+       printk(KERN_INFO "TLAN 1.3c: %s irq=%2d io=%04x, %s, Rev. %d\n",
                dev->name, 
                (int) irq, 
                io_base,
@@ -1121,7 +1123,7 @@ void TLan_SetMulticastList( struct device *dev )
 u32 TLan_HandleInvalid( struct device *dev, u16 host_int )
 {
        host_int = 0;
-       printk( "TLAN:  Invalid interrupt on %s.\n", dev->name ); 
+       /* printk( "TLAN:  Invalid interrupt on %s.\n", dev->name ); */
        return 0;
 
 } /* TLan_HandleInvalid */
index 6ad90d4cf9d55379826448143de0d3053e97ba69..047b6ecdf3d46bfdbd8a6456f4f202cc97b9521f 100644 (file)
@@ -351,6 +351,7 @@ typedef struct orc_scb {    /* Scsi_Ctrl_Blk                */
 #define ORC_EXECSCSI   0x00    /* SCSI initiator command with residual */
 #define ORC_BUSDEVRST  0x01    /* SCSI Bus Device Reset  */
 
+#ifndef HOSTS_C
 /* Status of ORCSCB_Status */
 #define SCB_COMPLETE   0x00    /* SCB request completed  */
 #define SCB_POST       0x01    /* SCB is posted by the HOST      */
@@ -401,6 +402,7 @@ typedef struct orc_scb {    /* Scsi_Ctrl_Blk                */
 #define        MSG_DEVRST      0x0C
 #define        MSG_STAG        0x20
 
+#endif
 /***********************************************************************
                Target Device Control Structure
 **********************************************************************/
index 8519b20f746df46779fb16c18c87e1ce12893b59..4f086238dbba1e24ac933ff683038f83b8828bba 100644 (file)
@@ -35,10 +35,7 @@ if [ "$CONFIG_SOUND_ES1371" = "y" ]; then
 fi
 
 dep_tristate 'ESS Maestro' CONFIG_SOUND_MAESTRO $CONFIG_SOUND
-
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-   dep_tristate 'ESS Solo1 (Experimental)' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND
-fi
+dep_tristate 'ESS Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND
 
 dep_tristate 'Intel ICH (810, 820, 440MX...)' CONFIG_SOUND_ICH $CONFIG_SOUND
 
@@ -315,6 +312,9 @@ if [ "$CONFIG_SOUND_OSS" = "y" -o "$CONFIG_SOUND_OSS" = "m" ]; then
   
   dep_tristate 'NM256AV/NM256ZX audio support' CONFIG_SOUND_NM256 $CONFIG_SOUND_OSS
   dep_tristate 'Yamaha PCI legacy mode support' CONFIG_SOUND_YMPCI $CONFIG_SOUND_OSS
+  if [ "$CONFIG_SOUND_YMPCI" = "n" ]; then
+    dep_tristate 'Yamaha PCI native mode support (EXPERIMENTAL)' CONFIG_SOUND_YMFPCI $CONFIG_SOUND_OSS
+  fi
 
   # Additional low level drivers.
   
index f46d6686eb3ada475aba98cc6dfc16179415c760..09795558e9bb7055cf99b60b01ab86d38e071a41 100644 (file)
@@ -97,6 +97,7 @@ obj-$(CONFIG_SOUND_MAESTRO)   += maestro.o
 obj-$(CONFIG_SOUND_SONICVIBES) += sonicvibes.o
 obj-$(CONFIG_SOUND_TRIDENT)     += trident.o ac97_codec.o
 obj-$(CONFIG_SOUND_VIA82CXXX)  += via82cxxx_audio.o ac97_codec.o
+obj-$(CONFIG_SOUND_YMFPCI)     += ymfpci.o ac97_codec.o
 
 ifeq ($(CONFIG_SOUND_EMU10K1),y)
   obj-y                                += emu10k1/emu10k1.o
index 3308f6e8f1704ed20aa62e801dfba54f4734f065..ff59d81e9c8d950f6e45efcbb6f1a53751111e57 100644 (file)
@@ -557,7 +557,7 @@ int ac97_probe_codec(struct ac97_codec *codec)
        id2 = codec->codec_read(codec, AC97_VENDOR_ID2);
        for (i = 0; i < arraysize(ac97_codec_ids); i++) {
                if (ac97_codec_ids[i].id == ((id1 << 16) | id2)) {
-                       codec->id = ac97_codec_ids[i].id;
+                       codec->type = ac97_codec_ids[i].id;
                        codec->name = ac97_codec_ids[i].name;
                        codec->codec_init = ac97_codec_ids[i].init;
                        break;
@@ -599,7 +599,7 @@ static int ac97_init_mixer(struct ac97_codec *codec)
        codec->codec_write(codec, AC97_PCMOUT_VOL, 0L);
 
        /* codec specific initialization for 4-6 channel output or secondary codec stuff */
-       if (codec->id != 0 && codec->codec_init != NULL) {
+       if (codec->codec_init != NULL) {
                codec->codec_init(codec);
        }
 
@@ -623,6 +623,11 @@ static int ac97_init_modem(struct ac97_codec *codec)
 
 static int sigmatel_init(struct ac97_codec * codec)
 {
+       if(codec->id == 0)
+               return;
+               
+       /* Only set up secondary codec */
+       
        codec->codec_write(codec, AC97_SURROUND_MASTER, 0L);
 
        /* initialize SigmaTel STAC9721/23 as secondary codec, decoding AC link
index 270efc5ac2447fcdaccb098b3475e205fa68fd31..3b5c85680585e326856f2e18797a1913283c087d 100644 (file)
@@ -52,43 +52,21 @@ struct sound_unit
        struct sound_unit *next;
 };
 
-#ifdef CONFIG_SOUND_SONICVIBES
 extern int init_sonicvibes(void);
-#endif
-#ifdef CONFIG_SOUND_MAESTRO
 extern int init_maestro(void);
-#endif
-#ifdef CONFIG_SOUND_TRIDENT
 extern int init_trident(void);
-#endif
-#ifdef CONFIG_SOUND_ICH
 extern int i810_probe(void);
-#endif
-#ifdef CONFIG_SOUND_ES1370
 extern int init_es1370(void);
-#endif
-#ifdef CONFIG_SOUND_ES1371
 extern int init_es1371(void);
-#endif
-#ifdef CONFIG_SOUND_MSNDCLAS
 extern int msnd_classic_init(void);
-#endif
-#ifdef CONFIG_SOUND_MSNDPIN
 extern int msnd_pinnacle_init(void);
-#endif
-#ifdef CONFIG_SOUND_ESSSOLO1
 extern int init_solo1(void);
-#endif
-#ifdef CONFIG_SOUND_YMPCI
 extern int init_ymf7xxsb_module(void);
-#endif
-#ifdef CONFIG_SOUND_FUSION
 extern int cs_probe(void);
-#endif
-#ifdef CONFIG_SOUND_EMU10K1
 extern int init_emu10k1(void);
-#endif
 extern int cs4281_probe(void);
+extern void init_vwsnd(void);
+extern int ymf_probe(void);
 
 
 /*
@@ -459,6 +437,9 @@ int soundcore_init(void)
 #endif
 #ifdef CONFIG_SOUND_EMU10K1
        init_emu10k1();
+#endif
+#ifdef CONFIG_SOUND_YMFPCI
+       ymf_probe();
 #endif
        return 0;
 }
index a5b92fc38b8d448f32111a1f374bb400811d06d4..dbf4bb3836d324e982bd2ecbbd488d4e86f20b44 100644 (file)
@@ -2249,7 +2249,7 @@ static int __init via_init_one (struct pci_dev *pdev)
        if (printed_version++ == 0)
                printk (KERN_INFO "Via 686a audio driver " VIA_VERSION "\n");
 
-       if (!check_region (pci_resource_start (pdev, 0),
+       if (check_region (pci_resource_start (pdev, 0),
                             pci_resource_len (pdev, 0))) {
                printk (KERN_ERR PFX "unable to obtain I/O resources, aborting\n");
                rc = -EBUSY;
diff --git a/drivers/sound/ymfpci.c b/drivers/sound/ymfpci.c
new file mode 100644 (file)
index 0000000..e92129b
--- /dev/null
@@ -0,0 +1,2394 @@
+/*
+ *  Copyright 1999 Jaroslav Kysela <perex@suse.cz>
+ *  Copyright 2000 Alan Cox <alan@redhat.com>
+ *
+ *  Yamaha YMF7xx driver.
+ *
+ *  This code is a result of high-speed collision
+ *  between ymfpci.c of ALSA and cs46xx.c of Linux.
+ *  -- Pete Zaitcev <zaitcev@metabyte.com>; 2000/09/18
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO:
+ *  - Use P44Slot for 44.1 playback.
+ *  - Capture and duplex
+ *  - 96KHz playback for DVD - use pitch of 2.0.
+ *  - uLaw for Sun apps.
+ *  - Retain DMA buffer on close, do not wait the end of frame.
+ *  - Cleanup
+ *      ? merge ymf_pcm and state
+ *      ? pcm interrupt no pointer
+ *      ? underused structure members
+ */
+
+#include <linux/module.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/malloc.h>
+#include <linux/poll.h>
+#include <linux/ac97_codec.h>
+#include <linux/sound.h>
+
+#include <asm/io.h>
+#include <asm/dma.h>
+#include <asm/uaccess.h>
+
+#include "ymfpci.h"
+
+#define snd_magic_cast(t, p, err)      ((t *)(p))
+
+/* Channels, such as play and record. I do only play a.t.m. XXX */
+#define NR_HW_CH       1
+
+static void ymfpci_free(ymfpci_t *codec);
+static int ymf_playback_trigger(ymfpci_t *codec, ymfpci_pcm_t *ypcm, int cmd);
+static int ymfpci_voice_alloc(ymfpci_t *codec, ymfpci_voice_type_t type,
+    int pair, ymfpci_voice_t **rvoice);
+static int ymfpci_voice_free(ymfpci_t *codec, ymfpci_voice_t *pvoice);
+static int ymf_playback_prepare(ymfpci_t *codec, struct ymf_state *state);
+static int ymf_state_alloc(ymfpci_t *unit, int nvirt, int instance);
+
+static ymfpci_t *ymf_devs = NULL;
+
+/*
+ *  constants
+ */
+
+static struct ymf_devid {
+       int id;
+       char *name;
+} ymf_devv[] = {
+       { PCI_DEVICE_ID_YAMAHA_724,  "YMF724" },
+       { PCI_DEVICE_ID_YAMAHA_724F, "YMF724F" },
+       { PCI_DEVICE_ID_YAMAHA_740,  "YMF740" },
+       { PCI_DEVICE_ID_YAMAHA_740C, "YMF740C" },
+       { PCI_DEVICE_ID_YAMAHA_744,  "YMF744" },
+       { PCI_DEVICE_ID_YAMAHA_754,  "YMF754" },
+};
+
+/*
+ * Mindlessly copied from cs46xx XXX
+ */
+extern __inline__ unsigned ld2(unsigned int x)
+{
+       unsigned r = 0;
+       
+       if (x >= 0x10000) {
+               x >>= 16;
+               r += 16;
+       }
+       if (x >= 0x100) {
+               x >>= 8;
+               r += 8;
+       }
+       if (x >= 0x10) {
+               x >>= 4;
+               r += 4;
+       }
+       if (x >= 4) {
+               x >>= 2;
+               r += 2;
+       }
+       if (x >= 2)
+               r++;
+       return r;
+}
+
+/*
+ *  common I/O routines
+ */
+
+static inline u8 ymfpci_readb(ymfpci_t *codec, u32 offset)
+{
+       return readb(codec->reg_area_virt + offset);
+}
+
+static inline void ymfpci_writeb(ymfpci_t *codec, u32 offset, u8 val)
+{
+       writeb(val, codec->reg_area_virt + offset);
+}
+
+static inline u16 ymfpci_readw(ymfpci_t *codec, u32 offset)
+{
+       return readw(codec->reg_area_virt + offset);
+}
+
+static inline void ymfpci_writew(ymfpci_t *codec, u32 offset, u16 val)
+{
+       writew(val, codec->reg_area_virt + offset);
+}
+
+static inline u32 ymfpci_readl(ymfpci_t *codec, u32 offset)
+{
+       return readl(codec->reg_area_virt + offset);
+}
+
+static inline void ymfpci_writel(ymfpci_t *codec, u32 offset, u32 val)
+{
+       writel(val, codec->reg_area_virt + offset);
+}
+
+static int ymfpci_codec_ready(ymfpci_t *codec, int secondary, int sched)
+{
+       signed long end_time;
+       u32 reg = secondary ? YDSXGR_SECSTATUSADR : YDSXGR_PRISTATUSADR;
+       
+       end_time = jiffies + 3 * (HZ / 4);
+       do {
+               if ((ymfpci_readw(codec, reg) & 0x8000) == 0)
+                       return 0;
+               if (sched) {
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+                       schedule_timeout(1);
+               }
+       } while (end_time - (signed long)jiffies >= 0);
+       printk("ymfpci_codec_ready: codec %i is not ready [0x%x]\n",
+           secondary, ymfpci_readw(codec, reg));
+       return -EBUSY;
+}
+
+static void ymfpci_codec_write(struct ac97_codec *dev, u8 reg, u16 val)
+{
+       ymfpci_t *codec = dev->private_data;
+       u32 cmd;
+
+       /* XXX Do make use of dev->id */
+       ymfpci_codec_ready(codec, 0, 0);
+       cmd = ((YDSXG_AC97WRITECMD | reg) << 16) | val;
+       ymfpci_writel(codec, YDSXGR_AC97CMDDATA, cmd);
+}
+
+static u16 ymfpci_codec_read(struct ac97_codec *dev, u8 reg)
+{
+       ymfpci_t *codec = dev->private_data;
+
+       if (ymfpci_codec_ready(codec, 0, 0))
+               return ~0;
+       ymfpci_writew(codec, YDSXGR_AC97CMDADR, YDSXG_AC97READCMD | reg);
+       if (ymfpci_codec_ready(codec, 0, 0))
+               return ~0;
+       if (codec->device_id == PCI_DEVICE_ID_YAMAHA_744 && codec->rev < 2) {
+               int i;
+               for (i = 0; i < 600; i++)
+                       ymfpci_readw(codec, YDSXGR_PRISTATUSDATA);
+       }
+       return ymfpci_readw(codec, YDSXGR_PRISTATUSDATA);
+}
+
+/*
+ *  Misc routines
+ */
+
+/*
+ * Calculate the actual sampling rate relatetively to the base clock (48kHz).
+ */
+static u32 ymfpci_calc_delta(u32 rate)
+{
+       switch (rate) {
+       case 8000:      return 0x02aaab00;
+       case 11025:     return 0x03accd00;
+       case 16000:     return 0x05555500;
+       case 22050:     return 0x07599a00;
+       case 32000:     return 0x0aaaab00;
+       case 44100:     return 0x0eb33300;
+       default:        return ((rate << 16) / 48000) << 12;
+       }
+}
+
+static u32 def_rate[8] = {
+       100, 2000, 8000, 11025, 16000, 22050, 32000, 48000
+};
+
+static u32 ymfpci_calc_lpfK(u32 rate)
+{
+       u32 i;
+       static u32 val[8] = {
+               0x00570000, 0x06AA0000, 0x18B20000, 0x20930000,
+               0x2B9A0000, 0x35A10000, 0x3EAA0000, 0x40000000
+       };
+       
+       if (rate == 44100)
+               return 0x40000000;      /* FIXME: What's the right value? */
+       for (i = 0; i < 8; i++)
+               if (rate <= def_rate[i])
+                       return val[i];
+       return val[0];
+}
+
+static u32 ymfpci_calc_lpfQ(u32 rate)
+{
+       u32 i;
+       static u32 val[8] = {
+               0x35280000, 0x34A70000, 0x32020000, 0x31770000,
+               0x31390000, 0x31C90000, 0x33D00000, 0x40000000
+       };
+       
+       if (rate == 44100)
+               return 0x370A0000;
+       for (i = 0; i < 8; i++)
+               if (rate <= def_rate[i])
+                       return val[i];
+       return val[0];
+}
+
+static u32 ymf_calc_lend(u32 rate)
+{
+       return (rate * YMF_SAMPF) / 48000;
+}
+
+/*
+ * XXX Find if this function exists in the OSS framework.
+ * XXX Make sure we do no panic when ADPCM is selected.
+ */
+static int ymf_pcm_format_width(int format)
+{
+       static int mask16 = AFMT_S16_LE|AFMT_S16_BE|AFMT_U16_LE|AFMT_U16_BE;
+
+       if ((format & (format-1)) != 0) {
+               printk(KERN_ERR "ymfpci: format 0x%x is not a power of 2\n", format);
+               return 8;
+       }
+
+       if (format == AFMT_IMA_ADPCM) return 4;
+       if ((format & mask16) != 0) return 16;
+       return 8;
+}
+
+static void ymf_pcm_update_shift(struct ymf_pcm_format *f)
+{
+       f->shift = 0;
+       if (f->voices == 2)
+               f->shift++;
+       if (ymf_pcm_format_width(f->format) == 16)
+               f->shift++;
+}
+
+/*
+ * Whole OSS-style DMA machinery is taken from cs46xx.
+ */
+
+/* Are you sure 32K is not too much? See if mpg123 skips on loaded systems. */
+#define DMABUF_DEFAULTORDER (15-PAGE_SHIFT)
+#define DMABUF_MINORDER 1
+
+/* allocate DMA buffer, playback and recording buffer should be allocated seperately */
+static int alloc_dmabuf(struct ymf_state *state)
+{
+       struct ymf_dmabuf *dmabuf = &state->dmabuf;
+       void *rawbuf = NULL;
+       int order;
+       unsigned long map, mapend;
+
+       /* alloc as big a chunk as we can */
+       for (order = DMABUF_DEFAULTORDER; order >= DMABUF_MINORDER; order--)
+               if((rawbuf = (void *)__get_free_pages(GFP_KERNEL|GFP_DMA, order)))
+                       break;
+
+       if (!rawbuf)
+               return -ENOMEM;
+
+#if 0
+       printk(KERN_DEBUG "ymfpci: allocated %ld (order = %d) bytes at %p\n",
+              PAGE_SIZE << order, order, rawbuf);
+#endif
+
+       dmabuf->ready  = dmabuf->mapped = 0;
+       dmabuf->rawbuf = rawbuf;
+       dmabuf->buforder = order;
+
+       /* now mark the pages as reserved; otherwise remap_page_range doesn't do what we want */
+       mapend = MAP_NR(rawbuf + (PAGE_SIZE << order) - 1);
+       for (map = MAP_NR(rawbuf); map <= mapend; map++)
+               set_bit(PG_reserved, &mem_map[map].flags);
+
+       return 0;
+}
+
+/* free DMA buffer */
+static void dealloc_dmabuf(struct ymf_state *state)
+{
+       struct ymf_dmabuf *dmabuf = &state->dmabuf;
+       unsigned long map, mapend;
+
+       if (dmabuf->rawbuf) {
+               /* undo marking the pages as reserved */
+               mapend = MAP_NR(dmabuf->rawbuf + (PAGE_SIZE << dmabuf->buforder) - 1);
+               for (map = MAP_NR(dmabuf->rawbuf); map <= mapend; map++)
+                       clear_bit(PG_reserved, &mem_map[map].flags);
+               free_pages((unsigned long)dmabuf->rawbuf,dmabuf->buforder);
+       }
+       dmabuf->rawbuf = NULL;
+       dmabuf->mapped = dmabuf->ready = 0;
+}
+
+static int prog_dmabuf(struct ymf_state *state, unsigned rec)
+{
+       struct ymf_dmabuf *dmabuf = &state->dmabuf;
+       int w_16;
+       unsigned bytepersec;
+       unsigned bufsize;
+       unsigned long flags;
+       int redzone;
+       int ret;
+
+       w_16 = ymf_pcm_format_width(state->format.format) == 16;
+
+       spin_lock_irqsave(&state->unit->reg_lock, flags);
+       dmabuf->hwptr = dmabuf->swptr = 0;
+       dmabuf->total_bytes = 0;
+       dmabuf->count = dmabuf->error = 0;
+       spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+
+       /* allocate DMA buffer if not allocated yet */
+       if (!dmabuf->rawbuf)
+               if ((ret = alloc_dmabuf(state)))
+                       return ret;
+
+       bytepersec = state->format.rate << state->format.shift;
+
+       /*
+        * Create fake fragment sizes and numbers for OSS ioctls.
+        */
+       bufsize = PAGE_SIZE << dmabuf->buforder;
+       if (dmabuf->ossfragshift) {
+               if ((1000 << dmabuf->ossfragshift) < bytepersec)
+                       dmabuf->fragshift = ld2(bytepersec/1000);
+               else
+                       dmabuf->fragshift = dmabuf->ossfragshift;
+       } else {
+               /* lets hand out reasonable big ass buffers by default */
+               dmabuf->fragshift = (dmabuf->buforder + PAGE_SHIFT -2);
+       }
+       dmabuf->numfrag = bufsize >> dmabuf->fragshift;
+       while (dmabuf->numfrag < 4 && dmabuf->fragshift > 3) {
+               dmabuf->fragshift--;
+               dmabuf->numfrag = bufsize >> dmabuf->fragshift;
+       }
+       dmabuf->fragsize = 1 << dmabuf->fragshift;
+       dmabuf->fragsamples = dmabuf->fragsize >> state->format.shift;
+       dmabuf->dmasize = dmabuf->numfrag << dmabuf->fragshift;
+
+       /*
+        * Import what Doom might have set with SNDCTL_DSD_SETFRAGMENT.
+        */
+       if (dmabuf->ossmaxfrags >= 2 && dmabuf->ossmaxfrags < dmabuf->numfrag) {
+               dmabuf->numfrag = dmabuf->ossmaxfrags;
+               dmabuf->dmasize = dmabuf->numfrag << dmabuf->fragshift;
+
+               redzone = ymf_calc_lend(state->format.rate);
+               redzone <<= (state->format.shift + 1);
+               if (dmabuf->dmasize < redzone*3) {
+                       /*
+                        * The driver works correctly with minimum dmasize
+                        * of redzone*2, but it produces stoppage and clicks.
+                        * So, make it little larger for smoother sound.
+                        * XXX Make dmasize a wholy divisible by fragsize.
+                        */
+//                     printk(KERN_ERR "ymfpci: dmasize=%d < redzone=%d * 3\n",
+//                         dmabuf->dmasize, redzone);
+                       dmabuf->dmasize = redzone*3;
+               }
+       }
+
+       memset(dmabuf->rawbuf, w_16 ? 0 : 0x80, dmabuf->dmasize);
+
+       /*
+        *      Now set up the ring 
+        */
+
+       spin_lock_irqsave(&state->unit->reg_lock, flags);
+       if (rec) {
+               /* ymf_rec_setup(state); */
+       } else {
+               if ((ret = ymf_playback_prepare(state->unit, state)) != 0) {
+                       return ret;
+               }
+       }
+       spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+
+       /* set the ready flag for the dma buffer (this comment is not stupid) */
+       dmabuf->ready = 1;
+
+#if 0
+       printk("prog_dmabuf: rate %d format 0x%x,"
+           " numfrag %d fragsize %d dmasize %d\n",
+              state->format.rate, state->format.format, dmabuf->numfrag,
+              dmabuf->fragsize, dmabuf->dmasize);
+#endif
+
+       return 0;
+}
+
+static void ymf_start_dac(struct ymf_state *state)
+{
+       ymf_playback_trigger(state->unit, &state->ypcm, 1);
+}
+
+/*
+ * Wait until output is drained.
+ * This does not kill the hardware for the sake of ioctls.
+ */
+static void ymf_wait_dac(struct ymf_state *state)
+{
+       struct ymf_unit *unit = state->unit;
+       ymfpci_pcm_t *ypcm = &state->ypcm;
+       struct wait_queue waita = { current, NULL };
+       unsigned long flags;
+
+       add_wait_queue(&state->dmabuf.wait, &waita);
+
+       spin_lock_irqsave(&unit->reg_lock, flags);
+       if (state->dmabuf.count != 0 && !state->ypcm.running) {
+               ymf_playback_trigger(unit, ypcm, 1);
+       }
+
+#if 0
+       if (file->f_flags & O_NONBLOCK) {
+               /*
+                * XXX Our  mistake is to attach DMA buffer to state
+                * rather than to some per-device structure.
+                * Cannot skip waiting, can only make it shorter.
+                */
+       }
+#endif
+
+       while (ypcm->running) {
+               spin_unlock_irqrestore(&unit->reg_lock, flags);
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               schedule();
+               spin_lock_irqsave(&unit->reg_lock, flags);
+       }
+       spin_unlock_irqrestore(&unit->reg_lock, flags);
+
+       set_current_state(TASK_RUNNING);
+       remove_wait_queue(&state->dmabuf.wait, &waita);
+
+       /*
+        * This function may take up to 4 seconds to reach this point
+        * (32K circular buffer, 8000 Hz). User notices.
+        */
+}
+
+/*
+ *  Hardware start management
+ */
+
+static void ymfpci_hw_start(ymfpci_t *codec)
+{
+       unsigned long flags;
+
+       spin_lock_irqsave(&codec->reg_lock, flags);
+       if (codec->start_count++ == 0) {
+               ymfpci_writel(codec, YDSXGR_MODE, 3);
+               codec->active_bank = ymfpci_readl(codec, YDSXGR_CTRLSELECT) & 1;
+       }
+       spin_unlock_irqrestore(&codec->reg_lock, flags);
+}
+
+static void ymfpci_hw_stop(ymfpci_t *codec)
+{
+       unsigned long flags;
+       long timeout = 1000;
+
+       spin_lock_irqsave(&codec->reg_lock, flags);
+       if (--codec->start_count == 0) {
+               ymfpci_writel(codec, YDSXGR_MODE, 0);
+               while (timeout-- > 0) {
+                       if ((ymfpci_readl(codec, YDSXGR_STATUS) & 2) == 0)
+                               break;
+               }
+       }
+       spin_unlock_irqrestore(&codec->reg_lock, flags);
+}
+
+/*
+ *  Playback voice management
+ */
+
+static int voice_alloc(ymfpci_t *codec, ymfpci_voice_type_t type, int pair, ymfpci_voice_t **rvoice)
+{
+       ymfpci_voice_t *voice, *voice2;
+       int idx;
+       
+       *rvoice = NULL;
+       for (idx = 0; idx < 64; idx += pair ? 2 : 1) {
+               voice = &codec->voices[idx];
+               voice2 = pair ? &codec->voices[idx+1] : NULL;
+               if (voice->use || (voice2 && voice2->use))
+                       continue;
+               voice->use = 1;
+               if (voice2)
+                       voice2->use = 1;
+               switch (type) {
+               case YMFPCI_PCM:
+                       voice->pcm = 1;
+                       if (voice2)
+                               voice2->pcm = 1;
+                       break;
+               case YMFPCI_SYNTH:
+                       voice->synth = 1;
+                       break;
+               case YMFPCI_MIDI:
+                       voice->midi = 1;
+                       break;
+               }
+               ymfpci_hw_start(codec);
+               if (voice2)
+                       ymfpci_hw_start(codec);
+               *rvoice = voice;
+               return 0;
+       }
+       return -ENOMEM;
+}
+
+static int ymfpci_voice_alloc(ymfpci_t *codec, ymfpci_voice_type_t type,
+    int pair, ymfpci_voice_t **rvoice)
+{
+       unsigned long flags;
+       int result;
+
+       spin_lock_irqsave(&codec->voice_lock, flags);
+       for (;;) {
+               result = voice_alloc(codec, type, pair, rvoice);
+               if (result == 0 || type != YMFPCI_PCM)
+                       break;
+               /* TODO: synth/midi voice deallocation */
+               break;
+       }
+       spin_unlock_irqrestore(&codec->voice_lock, flags);      
+       return result;          
+}
+
+static int ymfpci_voice_free(ymfpci_t *codec, ymfpci_voice_t *pvoice)
+{
+       unsigned long flags;
+       
+       ymfpci_hw_stop(codec);
+       spin_lock_irqsave(&codec->voice_lock, flags);
+       pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = 0;
+       pvoice->ypcm = NULL;
+       pvoice->interrupt = NULL;
+       spin_unlock_irqrestore(&codec->voice_lock, flags);
+       return 0;
+}
+
+/*
+ *  PCM part
+ */
+
+static void ymf_pcm_interrupt(ymfpci_t *codec, ymfpci_voice_t *voice)
+{
+       ymfpci_pcm_t *ypcm;
+       int redzone;
+       int pos, delta, swptr;
+       int played, distance;
+       struct ymf_state *state;
+       struct ymf_dmabuf *dmabuf;
+       char silence;
+
+       if ((ypcm = voice->ypcm) == NULL) {
+/* P3 */ printk("ymf_pcm_interrupt: voice %d: no ypcm\n", voice->number);
+               return;
+       }
+       if ((state = ypcm->state) == NULL) {
+/* P3 */ printk("ymf_pcm_interrupt: voice %d: no state\n", voice->number);
+               ypcm->running = 0;      // lock it
+               return;
+       }
+       dmabuf = &state->dmabuf;
+       spin_lock(&codec->reg_lock);
+       if (ypcm->running) {
+/* P3 */ /** printk("ymfpci: %d, intr bank %d count %d start 0x%x:%x\n",
+  voice->number, codec->active_bank, dmabuf->count,
+  voice->bank[0].start, voice->bank[1].start); **/
+               silence = (ymf_pcm_format_width(state->format.format) == 16) ?
+                   0 : 0x80;
+               /* We need actual left-hand-side redzone size here. */
+               redzone = ymf_calc_lend(state->format.rate);
+               redzone <<= (state->format.shift + 1);
+               swptr = dmabuf->swptr;
+
+               pos = voice->bank[codec->active_bank].start;
+               pos <<= state->format.shift;
+               if (pos < 0 || pos >= dmabuf->dmasize) {        /* ucode bug */
+                       printk(KERN_ERR
+                           "ymfpci%d: %d: runaway: hwptr %d dmasize %d\n",
+                           codec->inst, voice->number,
+                           dmabuf->hwptr, dmabuf->dmasize);
+                       pos = 0;
+               }
+               if (pos < dmabuf->hwptr) {
+                       delta = dmabuf->dmasize - dmabuf->hwptr;
+                       memset(dmabuf->rawbuf + dmabuf->hwptr, silence, delta);
+                       delta += pos;
+                       memset(dmabuf->rawbuf, silence, pos);
+               } else {
+                       delta = pos - dmabuf->hwptr;
+                       memset(dmabuf->rawbuf + dmabuf->hwptr, silence, delta);
+               }
+               dmabuf->hwptr = pos;
+
+               if (dmabuf->count == 0) {
+                       printk("ymfpci%d: %d: strain: hwptr %d\n",
+                           codec->inst, voice->number, dmabuf->hwptr);
+                       ymf_playback_trigger(codec, ypcm, 0);
+               }
+
+               if (swptr <= pos) {
+                       distance = pos - swptr;
+               } else {
+                       distance = dmabuf->dmasize - (swptr - pos);
+               }
+               if (distance < redzone) {
+                       /*
+                        * hwptr inside redzone => DMA ran out of samples.
+                        */
+                       if (delta < dmabuf->count) {
+                               /*
+                                * Lost interrupt or other screwage.
+                                */
+                               printk("ymfpci%d: %d: lost: delta %d"
+                                   " hwptr %d swptr %d distance %d count %d\n",
+                                   codec->inst, voice->number, delta,
+                                   dmabuf->hwptr, swptr, distance, dmabuf->count);
+                       } else {
+                               /*
+                                * Normal end of DMA.
+                                */
+                               printk("ymfpci%d: %d: done: delta %d"
+                                   " hwptr %d swptr %d distance %d count %d\n",
+                                   codec->inst, voice->number, delta,
+                                   dmabuf->hwptr, swptr, distance, dmabuf->count);
+                       }
+                       played = dmabuf->count;
+                       if (ypcm->running) {
+                               ymf_playback_trigger(codec, ypcm, 0);
+                       }
+               } else {
+                       /*
+                        * hwptr is chipping away towards a remote swptr.
+                        * Calculate other distance and apply it to count.
+                        */
+                       if (swptr >= pos) {
+                               distance = swptr - pos;
+                       } else {
+                               distance = dmabuf->dmasize - (pos - swptr);
+                       }
+                       if (distance < dmabuf->count) {
+                               played = dmabuf->count - distance;
+                       } else {
+                               played = 0;
+                       }
+               }
+
+               dmabuf->total_bytes += played;
+               dmabuf->count -= played;
+               if (dmabuf->count < dmabuf->dmasize / 2) {
+                       wake_up(&dmabuf->wait);
+               }
+       }
+       spin_unlock(&codec->reg_lock);
+}
+
+#if HAVE_RECORD
+static void ymfpci_pcm_capture_interrupt(snd_pcm_subchn_t *substream)
+{
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       ymfpci_pcm_t *ypcm = snd_magic_cast(ymfpci_pcm_t, runtime->private_data, );
+       ymfpci_t *codec = ypcm->codec;
+       u32 pos, delta;
+       
+       spin_lock(&codec->reg_lock);
+       if (ypcm->running) {
+               pos = codec->bank_capture[ypcm->capture_bank_number][codec->active_bank]->start << ypcm->shift_offset;
+               if (pos < ypcm->last_pos)  // <--  dmabuf->hwptr
+                       delta = pos + (ypcm->buffer_size - ypcm->last_pos);
+               else
+                       delta = pos - ypcm->last_pos;
+               ypcm->frag_pos += delta;
+               ypcm->last_pos = pos;
+               while (ypcm->frag_pos >= ypcm->frag_size) {
+                       ypcm->frag_pos -= ypcm->frag_size;
+                       // printk("done - active_bank = 0x%x, start = 0x%x\n", codec->active_bank, voice->bank[codec->active_bank].start);
+                       spin_unlock(&codec->reg_lock);
+                       snd_pcm_transfer_done(substream);
+                       spin_lock(&codec->reg_lock);
+               }
+       }
+       spin_unlock(&codec->reg_lock);
+}
+#endif
+
+static int ymf_playback_trigger(ymfpci_t *codec, ymfpci_pcm_t *ypcm, int cmd)
+{
+
+       if (ypcm->voices[0] == NULL) {
+/* P3 */ printk("ymfpci: trigger %d no voice\n", cmd);
+               return -EINVAL;
+       }
+       if (cmd != 0) {
+               codec->ctrl_playback[ypcm->voices[0]->number + 1] = virt_to_bus(ypcm->voices[0]->bank);
+               if (ypcm->voices[1] != NULL)
+                       codec->ctrl_playback[ypcm->voices[1]->number + 1] = virt_to_bus(ypcm->voices[1]->bank);
+               ypcm->running = 1;
+       } else {
+               codec->ctrl_playback[ypcm->voices[0]->number + 1] = 0;
+               if (ypcm->voices[1] != NULL)
+                       codec->ctrl_playback[ypcm->voices[1]->number + 1] = 0;
+               ypcm->running = 0;
+       }
+       return 0;
+}
+
+#if HAVE_RECORD
+static int ymfpci_capture_trigger(void *private_data,  
+                                     snd_pcm_subchn_t * substream,
+                                     int cmd)
+{
+       unsigned long flags;
+       ymfpci_t *codec = snd_magic_cast(ymfpci_t, private_data, -ENXIO);
+       ymfpci_pcm_t *ypcm = snd_magic_cast(ymfpci_pcm_t, substream->runtime->private_data, -ENXIO);
+       int result = 0;
+       u32 tmp;
+
+       spin_lock_irqsave(&codec->reg_lock, flags);
+       if (cmd == SND_PCM_TRIGGER_GO) {
+               tmp = ymfpci_readl(codec, YDSXGR_MAPOFREC) | (1 << ypcm->capture_bank_number);
+               ymfpci_writel(codec, YDSXGR_MAPOFREC, tmp);
+               ypcm->running = 1;
+       } else if (cmd == SND_PCM_TRIGGER_STOP) {
+               tmp = ymfpci_readl(codec, YDSXGR_MAPOFREC) & ~(1 << ypcm->capture_bank_number);
+               ymfpci_writel(codec, YDSXGR_MAPOFREC, tmp);
+               ypcm->running = 0;
+       } else {
+               result = -EINVAL;
+       }
+       spin_unlock_irqrestore(&codec->reg_lock, flags);
+       return result;
+}
+#endif
+
+static int ymfpci_pcm_voice_alloc(ymfpci_pcm_t *ypcm, int voices)
+{
+       int err;
+
+       if (ypcm->voices[1] != NULL && voices < 2) {
+               ymfpci_voice_free(ypcm->codec, ypcm->voices[1]);
+               ypcm->voices[1] = NULL;
+       }
+       if (voices == 1 && ypcm->voices[0] != NULL)
+               return 0;               /* already allocated */
+       if (voices == 2 && ypcm->voices[0] != NULL && ypcm->voices[1] != NULL)
+               return 0;               /* already allocated */
+       if (voices > 1) {
+               if (ypcm->voices[0] != NULL && ypcm->voices[1] == NULL) {
+                       ymfpci_voice_free(ypcm->codec, ypcm->voices[0]);
+                       ypcm->voices[0] = NULL;
+               }               
+       }
+       err = ymfpci_voice_alloc(ypcm->codec, YMFPCI_PCM, voices > 1, &ypcm->voices[0]);
+       if (err < 0)
+               return err;
+       ypcm->voices[0]->ypcm = ypcm;
+       ypcm->voices[0]->interrupt = ymf_pcm_interrupt;
+       if (voices > 1) {
+               ypcm->voices[1] = &ypcm->codec->voices[ypcm->voices[0]->number + 1];
+               ypcm->voices[1]->ypcm = ypcm;
+       }
+       return 0;
+}
+
+static void ymf_pcm_init_voice(ymfpci_voice_t *voice, int stereo,
+    int rate, int w_16, unsigned long addr, unsigned int end, int spdif)
+{
+       u32 format;
+       u32 delta = ymfpci_calc_delta(rate);
+       u32 lpfQ = ymfpci_calc_lpfQ(rate);
+       u32 lpfK = ymfpci_calc_lpfK(rate);
+       ymfpci_playback_bank_t *bank;
+       int nbank;
+
+       format = (stereo ? 0x00010000 : 0) | (w_16 ? 0 : 0x80000000);
+       if (stereo)
+               end >>= 1;
+       if (w_16)
+               end >>= 1;
+/* P3 */ printk("ymf_pcm_init_voice: %d: Rate %d Format 0x%08x Delta 0x%x End 0x%x\n",
+  voice->number, rate, format, delta, end);
+       for (nbank = 0; nbank < 2; nbank++) {
+               bank = &voice->bank[nbank];
+               bank->format = format;
+               bank->loop_default = 0; /* 0-loops forever, otherwise count */
+               bank->base = addr;
+               bank->loop_start = 0;
+               bank->loop_end = end;
+               bank->loop_frac = 0;
+               bank->eg_gain_end = 0x40000000;
+               bank->lpfQ = lpfQ;
+               bank->status = 0;
+               bank->num_of_frames = 0;
+               bank->loop_count = 0;
+               bank->start = 0;
+               bank->start_frac = 0;
+               bank->delta =
+               bank->delta_end = delta;
+               bank->lpfK =
+               bank->lpfK_end = lpfK;
+               bank->eg_gain = 0x40000000;
+               bank->lpfD1 =
+               bank->lpfD2 = 0;
+
+               bank->left_gain = 
+               bank->right_gain =
+               bank->left_gain_end =
+               bank->right_gain_end =
+               bank->eff1_gain =
+               bank->eff2_gain =
+               bank->eff3_gain =
+               bank->eff1_gain_end =
+               bank->eff2_gain_end =
+               bank->eff3_gain_end = 0;
+
+               if (!stereo) {
+                       if (!spdif) {
+                               bank->left_gain = 
+                               bank->right_gain =
+                               bank->left_gain_end =
+                               bank->right_gain_end = 0x40000000;
+                       } else {
+                               bank->eff2_gain =
+                               bank->eff2_gain_end =
+                               bank->eff3_gain =
+                               bank->eff3_gain_end = 0x40000000;
+                       }
+               } else {
+                       if (!spdif) {
+                               if ((voice->number & 1) == 0) {
+                                       bank->format |= 1;
+                                       bank->left_gain =
+                                       bank->left_gain_end = 0x40000000;
+                               } else {
+                                       bank->right_gain =
+                                       bank->right_gain_end = 0x40000000;
+                               }
+                       } else {
+                               if ((voice->number & 1) == 0) {
+                                       bank->format |= 1;
+                                       bank->eff2_gain =
+                                       bank->eff2_gain_end = 0x40000000;
+                               } else {
+                                       bank->eff3_gain =
+                                       bank->eff3_gain_end = 0x40000000;
+                               }
+                       }
+               }
+       }
+}
+
+/*
+ * XXX Use new cache coherent PCI DMA routines instead of virt_to_bus.
+ */
+static int ymf_playback_prepare(ymfpci_t *codec, struct ymf_state *state)
+{
+       ymfpci_pcm_t *ypcm = &state->ypcm;
+       int err, nvoice;
+
+       if ((err = ymfpci_pcm_voice_alloc(ypcm, state->format.voices)) < 0) {
+               /* Cannot be unless we leak voices in ymf_release! */
+               printk(KERN_ERR "ymfpci%d: cannot allocate voice!\n",
+                   codec->inst);
+               return err;
+       }
+
+       for (nvoice = 0; nvoice < state->format.voices; nvoice++) {
+               ymf_pcm_init_voice(ypcm->voices[nvoice],
+                   state->format.voices == 2, state->format.rate,
+                   ymf_pcm_format_width(state->format.format) == 16,
+                   virt_to_bus(state->dmabuf.rawbuf), state->dmabuf.dmasize,
+                   ypcm->spdif);
+       }
+       return 0;
+}
+
+#if 0  /* old */
+static int ymfpci_capture_prepare(void *private_data,
+                                     snd_pcm_subchn_t * substream)
+{
+       ymfpci_t *codec = snd_magic_cast(ymfpci_t, private_data, -ENXIO);
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       ymfpci_pcm_t *ypcm = snd_magic_cast(ymfpci_pcm_t, runtime->private_data, -ENXIO);
+       ymfpci_capture_bank_t * bank;
+       int nbank;
+       u32 rate, format;
+
+       ypcm->frag_size = snd_pcm_lib_transfer_fragment(substream);
+       ypcm->buffer_size = snd_pcm_lib_transfer_size(substream);
+       ypcm->frag_pos = 0;
+       ypcm->last_pos = 0;
+       ypcm->shift_offset = 0;
+       rate = ((48000 * 4096) / runtime->format.rate) - 1;
+       format = 0;
+       if (runtime->format.voices == 2)
+               format |= 2;
+       if (snd_pcm_format_width(runtime->format.format) == 8)
+               format |= 1;
+       switch (ypcm->capture_bank_number) {
+       case 0:
+               ymfpci_writel(codec, YDSXGR_RECFORMAT, format);
+               ymfpci_writel(codec, YDSXGR_RECSLOTSR, rate);
+               break;
+       case 1:
+               ymfpci_writel(codec, YDSXGR_ADCFORMAT, format);
+               ymfpci_writel(codec, YDSXGR_ADCSLOTSR, rate);
+               break;
+       }
+       for (nbank = 0; nbank < 2; nbank++) {
+               bank = codec->bank_capture[ypcm->capture_bank_number][nbank];
+               bank->base = virt_to_bus(runtime->dma_area->buf);
+               bank->loop_end = ypcm->buffer_size;
+               bank->start = 0;
+               bank->num_of_loops = 0;
+       }
+       if (runtime->digital.dig_valid)
+               /*runtime->digital.type == SND_PCM_DIG_AES_IEC958*/
+               ymfpci_writew(codec, YDSXGR_SPDIFOUTSTATUS, runtime->digital.dig_status[0] |
+                                                               (runtime->digital.dig_status[1] << 8));
+       return 0;
+}
+
+static unsigned int ymfpci_playback_pointer(void *private_data,
+                                               snd_pcm_subchn_t * substream)
+{
+       ymfpci_t *codec = snd_magic_cast(ymfpci_t, private_data, -ENXIO);
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       ymfpci_pcm_t *ypcm = snd_magic_cast(ymfpci_pcm_t, runtime->private_data, -ENXIO);
+       ymfpci_voice_t *voice = ypcm->voices[0];
+       unsigned long flags;
+       unsigned int result;
+
+       spin_lock_irqsave(&codec->reg_lock, flags);
+       if (ypcm->running && voice)
+               result = voice->bank[codec->active_bank].start << ypcm->shift_offset;
+       else
+               result = 0;
+       spin_unlock_irqrestore(&codec->reg_lock, flags);
+       return result;
+}
+
+static unsigned int ymfpci_capture_pointer(void *private_data,
+                                              snd_pcm_subchn_t * substream)
+{
+       ymfpci_t *codec = snd_magic_cast(ymfpci_t, private_data, -ENXIO);
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       ymfpci_pcm_t *ypcm = snd_magic_cast(ymfpci_pcm_t, runtime->private_data, -ENXIO);
+       unsigned long flags;
+       unsigned int result;
+
+       spin_lock_irqsave(&codec->reg_lock, flags);
+       if (ypcm->running)
+               result = codec->bank_capture[ypcm->capture_bank_number][codec->active_bank]->start << ypcm->shift_offset;
+       else
+               result = 0;
+       spin_unlock_irqrestore(&codec->reg_lock, flags);
+       return result;
+}
+#endif /* old */
+
+void ymf_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+       ymfpci_t *codec = dev_id;
+       u32 status, nvoice, mode;
+       ymfpci_voice_t *voice;
+
+       status = ymfpci_readl(codec, YDSXGR_STATUS);
+       if (status & 0x80000000) {
+               spin_lock(&codec->reg_lock);
+               ymfpci_writel(codec, YDSXGR_STATUS, 0x80000000);
+               mode = ymfpci_readl(codec, YDSXGR_MODE) | 2;
+               ymfpci_writel(codec, YDSXGR_MODE, mode);
+               spin_unlock(&codec->reg_lock);
+               codec->active_bank = ymfpci_readl(codec, YDSXGR_CTRLSELECT) & 1;
+               spin_lock(&codec->voice_lock);
+               for (nvoice = 0; nvoice < 64; nvoice++) {
+                       voice = &codec->voices[nvoice];
+                       if (voice->interrupt)
+                               voice->interrupt(codec, voice);
+               }
+               spin_unlock(&codec->voice_lock);
+       }
+
+       status = ymfpci_readl(codec, YDSXGR_INTFLAG);
+       if (status & 1) {
+               /* timer handler */
+               ymfpci_writel(codec, YDSXGR_INTFLAG, ~0);
+       }
+}
+
+static void ymf_pcm_free_substream(ymfpci_pcm_t *ypcm)
+{
+       ymfpci_t *codec;
+
+       if (ypcm) {
+               codec = ypcm->codec;
+               if (ypcm->voices[1])
+                       ymfpci_voice_free(codec, ypcm->voices[1]);
+               if (ypcm->voices[0])
+                       ymfpci_voice_free(codec, ypcm->voices[0]);
+       }
+}
+
+static int ymf_state_alloc(ymfpci_t *unit, int nvirt, int instance)
+{
+       ymfpci_pcm_t *ypcm;
+       struct ymf_state *state;
+
+       if ((state = kmalloc(sizeof(struct ymf_state), GFP_KERNEL)) == NULL) {
+               goto out0;
+       }
+       memset(state, 0, sizeof(struct ymf_state));
+
+       ypcm = &state->ypcm;
+       ypcm->state = state;
+       ypcm->codec = unit;
+       ypcm->type = PLAYBACK_VOICE;
+
+       state->unit = unit;
+       state->virt = nvirt;
+
+       state->format.format = AFMT_U8;
+       state->format.rate = 8000;
+       state->format.voices = 1;
+       ymf_pcm_update_shift(&state->format);
+
+       unit->states[nvirt] = state;
+       return 0;
+
+out0:
+       return -ENOMEM;
+}
+
+#if HAVE_RECORD
+
+static int ymfpci_capture_open(void *private_data,
+                                  snd_pcm_subchn_t * substream,
+                                  u32 capture_bank_number)
+{
+       ymfpci_t *codec = snd_magic_cast(ymfpci_t, private_data, -ENXIO);
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       ymfpci_pcm_t *ypcm;
+       int err;
+
+       if ((err = snd_pcm_dma_alloc(substream, !capture_bank_number ? codec->dma2ptr : codec->dma3ptr, "YMFPCI - ADC")) < 0)
+               return err;
+       ypcm = snd_magic_kcalloc(ymfpci_pcm_t, 0, GFP_KERNEL);
+       if (ypcm == NULL) {
+               snd_pcm_dma_free(substream);
+               return -ENOMEM;
+       }
+       ypcm->codec = codec;
+       ypcm->type = capture_bank_number + CAPTURE_REC;
+       ypcm->substream = substream;    
+       ypcm->capture_bank_number = capture_bank_number;
+       codec->capture_substream[capture_bank_number] = substream;
+       runtime->hw = &ymfpci_capture;
+       snd_pcm_set_mixer(substream, codec->mixer->device, codec->ac97->me_capture);
+       runtime->private_data = ypcm;
+       runtime->private_free = ymfpci_pcm_free_substream;
+       ymfpci_hw_start(codec);
+       return 0;
+}
+
+#endif  /* old */
+
+/* AES/IEC958 channel status bits */
+#define SND_PCM_AES0_PROFESSIONAL      (1<<0)  /* 0 = consumer, 1 = professional */
+#define SND_PCM_AES0_NONAUDIO          (1<<1)  /* 0 = audio, 1 = non-audio */
+#define SND_PCM_AES0_PRO_EMPHASIS      (7<<2)  /* mask - emphasis */
+#define SND_PCM_AES0_PRO_EMPHASIS_NOTID        (0<<2)  /* emphasis not indicated */
+#define SND_PCM_AES0_PRO_EMPHASIS_NONE (1<<2)  /* none emphasis */
+#define SND_PCM_AES0_PRO_EMPHASIS_5015 (3<<2)  /* 50/15us emphasis */
+#define SND_PCM_AES0_PRO_EMPHASIS_CCITT        (7<<2)  /* CCITT J.17 emphasis */
+#define SND_PCM_AES0_PRO_FREQ_UNLOCKED (1<<5)  /* source sample frequency: 0 = locked, 1 = unlocked */
+#define SND_PCM_AES0_PRO_FS            (3<<6)  /* mask - sample frequency */
+#define SND_PCM_AES0_PRO_FS_NOTID      (0<<6)  /* fs not indicated */
+#define SND_PCM_AES0_PRO_FS_44100      (1<<6)  /* 44.1kHz */
+#define SND_PCM_AES0_PRO_FS_48000      (2<<6)  /* 48kHz */
+#define SND_PCM_AES0_PRO_FS_32000      (3<<6)  /* 32kHz */
+#define SND_PCM_AES0_CON_NOT_COPYRIGHT (1<<2)  /* 0 = copyright, 1 = not copyright */
+#define SND_PCM_AES0_CON_EMPHASIS      (7<<3)  /* mask - emphasis */
+#define SND_PCM_AES0_CON_EMPHASIS_NONE (0<<3)  /* none emphasis */
+#define SND_PCM_AES0_CON_EMPHASIS_5015 (1<<3)  /* 50/15us emphasis */
+#define SND_PCM_AES0_CON_MODE          (3<<6)  /* mask - mode */
+#define SND_PCM_AES1_PRO_MODE          (15<<0) /* mask - channel mode */
+#define SND_PCM_AES1_PRO_MODE_NOTID    (0<<0)  /* not indicated */
+#define SND_PCM_AES1_PRO_MODE_STEREOPHONIC (2<<0) /* stereophonic - ch A is left */
+#define SND_PCM_AES1_PRO_MODE_SINGLE   (4<<0)  /* single channel */
+#define SND_PCM_AES1_PRO_MODE_TWO      (8<<0)  /* two channels */
+#define SND_PCM_AES1_PRO_MODE_PRIMARY  (12<<0) /* primary/secondary */
+#define SND_PCM_AES1_PRO_MODE_BYTE3    (15<<0) /* vector to byte 3 */
+#define SND_PCM_AES1_PRO_USERBITS      (15<<4) /* mask - user bits */
+#define SND_PCM_AES1_PRO_USERBITS_NOTID        (0<<4)  /* not indicated */
+#define SND_PCM_AES1_PRO_USERBITS_192  (8<<4)  /* 192-bit structure */
+#define SND_PCM_AES1_PRO_USERBITS_UDEF (12<<4) /* user defined application */
+#define SND_PCM_AES1_CON_CATEGORY      0x7f
+#define SND_PCM_AES1_CON_GENERAL       0x00
+#define SND_PCM_AES1_CON_EXPERIMENTAL  0x40
+#define SND_PCM_AES1_CON_SOLIDMEM_MASK 0x0f
+#define SND_PCM_AES1_CON_SOLIDMEM_ID   0x08
+#define SND_PCM_AES1_CON_BROADCAST1_MASK 0x07
+#define SND_PCM_AES1_CON_BROADCAST1_ID 0x04
+#define SND_PCM_AES1_CON_DIGDIGCONV_MASK 0x07
+#define SND_PCM_AES1_CON_DIGDIGCONV_ID 0x02
+#define SND_PCM_AES1_CON_ADC_COPYRIGHT_MASK 0x1f
+#define SND_PCM_AES1_CON_ADC_COPYRIGHT_ID 0x06
+#define SND_PCM_AES1_CON_ADC_MASK      0x1f
+#define SND_PCM_AES1_CON_ADC_ID                0x16
+#define SND_PCM_AES1_CON_BROADCAST2_MASK 0x0f
+#define SND_PCM_AES1_CON_BROADCAST2_ID 0x0e
+#define SND_PCM_AES1_CON_LASEROPT_MASK 0x07
+#define SND_PCM_AES1_CON_LASEROPT_ID   0x01
+#define SND_PCM_AES1_CON_MUSICAL_MASK  0x07
+#define SND_PCM_AES1_CON_MUSICAL_ID    0x05
+#define SND_PCM_AES1_CON_MAGNETIC_MASK 0x07
+#define SND_PCM_AES1_CON_MAGNETIC_ID   0x03
+#define SND_PCM_AES1_CON_IEC908_CD     (SND_PCM_AES1_CON_LASEROPT_ID|0x00)
+#define SND_PCM_AES1_CON_NON_IEC908_CD (SND_PCM_AES1_CON_LASEROPT_ID|0x08)
+#define SND_PCM_AES1_CON_PCM_CODER     (SND_PCM_AES1_CON_DIGDIGCONV_ID|0x00)
+#define SND_PCM_AES1_CON_SAMPLER       (SND_PCM_AES1_CON_DIGDIGCONV_ID|0x20)
+#define SND_PCM_AES1_CON_MIXER         (SND_PCM_AES1_CON_DIGDIGCONV_ID|0x10)
+#define SND_PCM_AES1_CON_RATE_CONVERTER        (SND_PCM_AES1_CON_DIGDIGCONV_ID|0x18)
+#define SND_PCM_AES1_CON_SYNTHESIZER   (SND_PCM_AES1_CON_MUSICAL_ID|0x00)
+#define SND_PCM_AES1_CON_MICROPHONE    (SND_PCM_AES1_CON_MUSICAL_ID|0x08)
+#define SND_PCM_AES1_CON_DAT           (SND_PCM_AES1_CON_MAGNETIC_ID|0x00)
+#define SND_PCM_AES1_CON_VCR           (SND_PCM_AES1_CON_MAGNETIC_ID|0x08)
+#define SND_PCM_AES1_CON_ORIGINAL      (1<<7)  /* this bits depends on the category code */
+#define SND_PCM_AES2_PRO_SBITS         (7<<0)  /* mask - sample bits */
+#define SND_PCM_AES2_PRO_SBITS_20      (2<<0)  /* 20-bit - coordination */
+#define SND_PCM_AES2_PRO_SBITS_24      (4<<0)  /* 24-bit - main audio */
+#define SND_PCM_AES2_PRO_SBITS_UDEF    (6<<0)  /* user defined application */
+#define SND_PCM_AES2_PRO_WORDLEN       (7<<3)  /* mask - source word length */
+#define SND_PCM_AES2_PRO_WORDLEN_NOTID (0<<3)  /* not indicated */
+#define SND_PCM_AES2_PRO_WORDLEN_22_18 (2<<3)  /* 22-bit or 18-bit */
+#define SND_PCM_AES2_PRO_WORDLEN_23_19 (4<<3)  /* 23-bit or 19-bit */
+#define SND_PCM_AES2_PRO_WORDLEN_24_20 (5<<3)  /* 24-bit or 20-bit */
+#define SND_PCM_AES2_PRO_WORDLEN_20_16 (6<<3)  /* 20-bit or 16-bit */
+#define SND_PCM_AES2_CON_SOURCE                (15<<0) /* mask - source number */
+#define SND_PCM_AES2_CON_SOURCE_UNSPEC (0<<0)  /* unspecified */
+#define SND_PCM_AES2_CON_CHANNEL       (15<<4) /* mask - channel number */
+#define SND_PCM_AES2_CON_CHANNEL_UNSPEC        (0<<4)  /* unspecified */
+#define SND_PCM_AES3_CON_FS            (15<<0) /* mask - sample frequency */
+#define SND_PCM_AES3_CON_FS_44100      (0<<0)  /* 44.1kHz */
+#define SND_PCM_AES3_CON_FS_48000      (2<<0)  /* 48kHz */
+#define SND_PCM_AES3_CON_FS_32000      (3<<0)  /* 32kHz */
+#define SND_PCM_AES3_CON_CLOCK         (3<<4)  /* mask - clock accuracy */
+#define SND_PCM_AES3_CON_CLOCK_1000PPM (0<<4)  /* 1000 ppm */
+#define SND_PCM_AES3_CON_CLOCK_50PPM   (1<<4)  /* 50 ppm */
+#define SND_PCM_AES3_CON_CLOCK_VARIABLE        (2<<4)  /* variable pitch */
+
+#if HAVE_RECORD  /* old */
+
+static int ymfpci_capture_close(void *private_data,
+                                   snd_pcm_subchn_t * substream)
+{
+       ymfpci_t *codec = snd_magic_cast(ymfpci_t, private_data, -ENXIO);
+       snd_pcm_runtime_t *runtime = substream->runtime;
+       ymfpci_pcm_t *ypcm = snd_magic_cast(ymfpci_pcm_t, runtime->private_data, -ENXIO);
+
+       if (ypcm != NULL) {
+               codec->capture_substream[ypcm->capture_bank_number] = NULL;
+               ymfpci_hw_stop(codec);
+       }
+       snd_pcm_dma_free(substream);
+       return 0;
+}
+#endif
+
+/*
+ * User interface
+ */
+
+static loff_t ymf_llseek(struct file *file, loff_t offset, int origin)
+{
+       return -ESPIPE;
+}
+
+/* in this loop, dmabuf.count signifies the amount of data that is waiting to be copied to
+   the user's buffer.  it is filled by the dma machine and drained by this loop. */
+static ssize_t ymf_read(struct file *file, char *buffer, size_t count, loff_t *ppos)
+{
+#if HAVE_RECORD
+       struct cs_state *state = (struct cs_state *)file->private_data;
+       struct dmabuf *dmabuf = &state->dmabuf;
+       ssize_t ret;
+       unsigned long flags;
+       unsigned swptr;
+       int cnt;
+
+#ifdef DEBUG
+       printk("cs461x: cs_read called, count = %d\n", count);
+#endif
+
+       if (ppos != &file->f_pos)
+               return -ESPIPE;
+       if (dmabuf->mapped)
+               return -ENXIO;
+       if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
+               return ret;
+       if (!access_ok(VERIFY_WRITE, buffer, count))
+               return -EFAULT;
+       ret = 0;
+
+       while (count > 0) {
+               spin_lock_irqsave(&state->card->lock, flags);
+               if (dmabuf->count > (signed) dmabuf->dmasize) {
+                       /* buffer overrun, we are recovering from sleep_on_timeout,
+                          resync hwptr and swptr, make process flush the buffer */
+                       dmabuf->count = dmabuf->dmasize;
+                       dmabuf->swptr = dmabuf->hwptr;
+               }
+               swptr = dmabuf->swptr;
+               cnt = dmabuf->dmasize - swptr;
+               if (dmabuf->count < cnt)
+                       cnt = dmabuf->count;
+               spin_unlock_irqrestore(&state->card->lock, flags);
+
+               if (cnt > count)
+                       cnt = count;
+               if (cnt <= 0) {
+                       unsigned long tmo;
+                       /* buffer is empty, start the dma machine and wait for data to be
+                          recorded */
+                       start_adc(state);
+                       if (file->f_flags & O_NONBLOCK) {
+                               if (!ret) ret = -EAGAIN;
+                               return ret;
+                       }
+                       /* This isnt strictly right for the 810  but it'll do */
+                       tmo = (dmabuf->dmasize * HZ) / (dmabuf->rate * 2);
+                       tmo >>= sample_shift[dmabuf->fmt];
+                       /* There are two situations when sleep_on_timeout returns, one is when
+                          the interrupt is serviced correctly and the process is waked up by
+                          ISR ON TIME. Another is when timeout is expired, which means that
+                          either interrupt is NOT serviced correctly (pending interrupt) or it
+                          is TOO LATE for the process to be scheduled to run (scheduler latency)
+                          which results in a (potential) buffer overrun. And worse, there is
+                          NOTHING we can do to prevent it. */
+                       if (!interruptible_sleep_on_timeout(&dmabuf->wait, tmo)) {
+#ifdef DEBUG
+                               printk(KERN_ERR "cs461x: recording schedule timeout, "
+                                      "dmasz %u fragsz %u count %i hwptr %u swptr %u\n",
+                                      dmabuf->dmasize, dmabuf->fragsize, dmabuf->count,
+                                      dmabuf->hwptr, dmabuf->swptr);
+#endif
+                               /* a buffer overrun, we delay the recovery untill next time the
+                                  while loop begin and we REALLY have space to record */
+                       }
+                       if (signal_pending(current)) {
+                               ret = ret ? ret : -ERESTARTSYS;
+                               return ret;
+                       }
+                       continue;
+               }
+
+               if (copy_to_user(buffer, dmabuf->rawbuf + swptr, cnt)) {
+                       if (!ret) ret = -EFAULT;
+                       return ret;
+               }
+
+               swptr = (swptr + cnt) % dmabuf->dmasize;
+
+               spin_lock_irqsave(&state->card->lock, flags);
+               dmabuf->swptr = swptr;
+               dmabuf->count -= cnt;
+               spin_unlock_irqrestore(&state->card->lock, flags);
+
+               count -= cnt;
+               buffer += cnt;
+               ret += cnt;
+               start_adc(state);
+       }
+       return ret;
+#else
+       return -EINVAL;
+#endif
+}
+
+static ssize_t ymf_write(struct file *file, const char *buffer, size_t count, loff_t *ppos)
+{
+       struct ymf_state *state = (struct ymf_state *)file->private_data;
+       struct ymf_dmabuf *dmabuf = &state->dmabuf;
+       struct wait_queue waita = { current, NULL };
+       ssize_t ret;
+       unsigned long flags;
+       unsigned int swptr;
+       int cnt;                        /* This many to go in this revolution */
+       int redzone;
+       int delay;
+
+/* P3 */ /* printk("ymf_write: count %d\n", count); */
+
+       if (ppos != &file->f_pos)
+               return -ESPIPE;
+       if (dmabuf->mapped)
+               return -ENXIO;
+       if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
+               return ret;
+       if (!access_ok(VERIFY_READ, buffer, count))
+               return -EFAULT;
+       ret = 0;
+
+       /*
+        * Alan's cs46xx works without a red zone - marvel of ingenuity.
+        * We are not so brilliant... Red zone does two things:
+        *  1. allows for safe start after a pause as we have no way
+        *     to know what the actual, relentlessly advancing, hwptr is.
+        *  2. makes computations in ymf_pcm_interrupt simpler.
+        */
+       redzone = ymf_calc_lend(state->format.rate) << state->format.shift;
+       redzone *= 3;   /* 2 redzone + 1 possible uncertainty reserve. */
+
+       add_wait_queue(&dmabuf->wait, &waita);
+       while (count > 0) {
+               spin_lock_irqsave(&state->unit->reg_lock, flags);
+               if (dmabuf->count < 0) {
+                       printk(KERN_ERR
+                          "ymf_write: count %d, was legal in cs46xx\n",
+                           dmabuf->count);
+                       dmabuf->count = 0;
+               }
+               if (dmabuf->count == 0) {
+                       swptr = dmabuf->hwptr;
+                       if (state->ypcm.running) {
+                               /*
+                                * Add uncertainty reserve.
+                                */
+                               cnt = ymf_calc_lend(state->format.rate);
+                               cnt <<= state->format.shift;
+                               if ((swptr += cnt) >= dmabuf->dmasize) {
+                                       swptr -= dmabuf->dmasize;
+                               }
+                       }
+                       dmabuf->swptr = swptr;
+               } else {
+                       /*
+                        * XXX This is not right if dmabuf->count is small -
+                        * about 2*x frame size or less. We cannot count on
+                        * on appending and not causing an artefact.
+                        * Should use a variation of the count==0 case above.
+                        */
+                       swptr = dmabuf->swptr;
+               }
+               cnt = dmabuf->dmasize - swptr;
+               if (dmabuf->count + cnt > dmabuf->dmasize - redzone)
+                       cnt = (dmabuf->dmasize - redzone) - dmabuf->count;
+               spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+
+               if (cnt > count)
+                       cnt = count;
+               if (cnt <= 0) {
+/* P3 */ /* printk("ymf_write: full, count %d swptr %d\n",
+  dmabuf->count, dmabuf->swptr); */
+                       /*
+                        * buffer is full, start the dma machine and
+                        * wait for data to be played
+                        */
+                       spin_lock_irqsave(&state->unit->reg_lock, flags);
+                       if (!state->ypcm.running) {
+                               ymf_playback_trigger(state->unit, &state->ypcm, 1);
+                       }
+                       spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+                       if (file->f_flags & O_NONBLOCK) {
+                               if (!ret) ret = -EAGAIN;
+                               break;
+                       }
+                       set_current_state(TASK_INTERRUPTIBLE);
+                       schedule();
+                       if (signal_pending(current)) {
+                               if (!ret) ret = -ERESTARTSYS;
+                               break;
+                       }
+                       continue;
+               }
+               if (copy_from_user(dmabuf->rawbuf + swptr, buffer, cnt)) {
+                       if (!ret) ret = -EFAULT;
+                       break;
+               }
+
+               if ((swptr += cnt) >= dmabuf->dmasize) {
+                       swptr -= dmabuf->dmasize;
+               }
+
+               spin_lock_irqsave(&state->unit->reg_lock, flags);
+               dmabuf->swptr = swptr;
+               dmabuf->count += cnt;
+
+               /*
+                * Start here is a bad idea - may cause startup click
+                * in /bin/play when dmabuf is not full yet.
+                * However, some broken applications do not make
+                * any use of SNDCTL_DSP_SYNC (Doom is the worst).
+                * One frame is about 5.3ms, Doom write size is 46ms.
+                */
+               delay = state->format.rate / 20;        /* 50ms */
+               delay <<= state->format.shift;
+               if (dmabuf->count >= delay && !state->ypcm.running) {
+                       ymf_playback_trigger(state->unit, &state->ypcm, 1);
+               }
+
+               spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+
+               count -= cnt;
+               buffer += cnt;
+               ret += cnt;
+       }
+
+       set_current_state(TASK_RUNNING);
+       remove_wait_queue(&dmabuf->wait, &waita);
+
+/* P3 */ /* printk("ymf_write: dmabuf.count %d\n", dmabuf->count); */
+       return ret;
+}
+
+static unsigned int ymf_poll(struct file *file, struct poll_table_struct *wait)
+{
+       struct ymf_state *state = (struct ymf_state *)file->private_data;
+       struct ymf_dmabuf *dmabuf = &state->dmabuf;
+       unsigned long flags;
+       unsigned int mask = 0;
+
+       if (file->f_mode & (FMODE_WRITE | FMODE_READ))
+               poll_wait(file, &dmabuf->wait, wait);
+
+       spin_lock_irqsave(&state->card->lock, flags);
+       if (file->f_mode & FMODE_READ) {
+               if (dmabuf->count >= (signed)dmabuf->fragsize)
+                       mask |= POLLIN | POLLRDNORM;
+       }
+       if (file->f_mode & FMODE_WRITE) {
+               if (dmabuf->mapped) {
+                       if (dmabuf->count >= (signed)dmabuf->fragsize)
+                               mask |= POLLOUT | POLLWRNORM;
+               } else {
+                       if ((signed)dmabuf->dmasize >= dmabuf->count + (signed)dmabuf->fragsize)
+                               mask |= POLLOUT | POLLWRNORM;
+               }
+       }
+       spin_unlock_irqrestore(&state->card->lock, flags);
+
+       return mask;
+}
+
+static int ymf_mmap(struct file *file, struct vm_area_struct *vma)
+{
+       struct ymf_state *state = (struct ymf_state *)file->private_data;
+       struct ymf_dmabuf *dmabuf = &state->dmabuf;
+       int ret;
+       unsigned long size;
+       
+
+       if (vma->vm_flags & VM_WRITE) {
+               if ((ret = prog_dmabuf(state, 0)) != 0)
+                       return ret;
+       } else if (vma->vm_flags & VM_READ) {
+               if ((ret = prog_dmabuf(state, 1)) != 0)
+                       return ret;
+       } else 
+               return -EINVAL;
+
+       if (vma->vm_offset != 0)
+               return -EINVAL;
+       size = vma->vm_end - vma->vm_start;
+       if (size > (PAGE_SIZE << dmabuf->buforder))
+               return -EINVAL;
+       if (remap_page_range(vma->vm_start, virt_to_phys(dmabuf->rawbuf),
+                            size, vma->vm_page_prot))
+               return -EAGAIN;
+       dmabuf->mapped = 1;
+
+       return 0;
+}
+
+static int ymf_ioctl(struct inode *inode, struct file *file,
+    unsigned int cmd, unsigned long arg)
+{
+       struct ymf_state *state = (struct ymf_state *)file->private_data;
+       struct ymf_dmabuf *dmabuf = &state->dmabuf;
+       unsigned long flags;
+       audio_buf_info abinfo;
+       count_info cinfo;
+       int val;
+
+       switch (cmd) {
+       case OSS_GETVERSION:
+               return put_user(SOUND_VERSION, (int *)arg);
+
+       case SNDCTL_DSP_RESET:
+               /* FIXME: spin_lock ? */
+               if (file->f_mode & FMODE_WRITE) {
+                       ymf_wait_dac(state);
+                       dmabuf->ready = 0;
+                       dmabuf->swptr = dmabuf->hwptr = 0;
+                       dmabuf->count = dmabuf->total_bytes = 0;
+               }
+#if HAVE_RECORD
+               if (file->f_mode & FMODE_READ) {
+                       stop_adc(state);
+                       synchronize_irq();
+                       dmabuf->ready = 0;
+                       dmabuf->swptr = dmabuf->hwptr = 0;
+                       dmabuf->count = dmabuf->total_bytes = 0;
+               }
+#endif
+               return 0;
+
+       case SNDCTL_DSP_SYNC:
+               if (file->f_mode & FMODE_WRITE) {
+                       if (file->f_flags & O_NONBLOCK) {
+                               spin_lock_irqsave(&state->unit->reg_lock, flags);
+                               if (dmabuf->count != 0 && !state->ypcm.running) {
+                                       ymf_start_dac(state);
+                               }
+                               spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+                       } else {
+                               ymf_wait_dac(state);
+                       }
+               }
+               return 0;
+
+       case SNDCTL_DSP_SPEED: /* set smaple rate */
+               get_user_ret(val, (int *)arg, -EFAULT);
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_SPEED %d\n", val); */
+               if (val >= 8000 && val <= 48000) {
+                       spin_lock_irqsave(&state->unit->reg_lock, flags);
+                       if (file->f_mode & FMODE_WRITE) {
+                               ymf_wait_dac(state);
+                       }
+#if HAVE_RECORD
+                       if (file->f_mode & FMODE_READ) {
+                               stop_adc(state);
+                       }
+#endif
+                       dmabuf->ready = 0;
+                       state->format.rate = val;
+                       ymf_pcm_update_shift(&state->format);
+                       spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               }
+               return put_user(state->format.rate, (int *)arg);
+
+       /*
+        * OSS manual does not mention SNDCTL_DSP_STEREO at all.
+        * All channels are mono and if you want stereo, you
+        * play into two channels with SNDCTL_DSP_CHANNELS.
+        * However, mpg123 uses it. I wonder, why Michael Hipp uses it.
+        */
+       case SNDCTL_DSP_STEREO: /* set stereo or mono channel */
+               get_user_ret(val, (int *)arg, -EFAULT);
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_STEREO %d\n", val); */
+               if (file->f_mode & FMODE_WRITE) {
+                       ymf_wait_dac(state); 
+                       spin_lock_irqsave(&state->unit->reg_lock, flags);
+                       dmabuf->ready = 0;
+                       state->format.voices = val ? 2 : 1;
+                       ymf_pcm_update_shift(&state->format);
+                       spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               }
+#if HAVE_RECORD
+               if (file->f_mode & FMODE_READ) {
+                       /* stop_adc(state); */
+                       dmabuf->ready = 0;
+                       if(val)
+                               dmabuf->fmt |= CS_FMT_STEREO;
+                       else
+                               dmabuf->fmt &= ~CS_FMT_STEREO;
+               }
+#endif
+               return 0;
+
+       case SNDCTL_DSP_GETBLKSIZE:
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_GETBLKSIZE\n"); */
+               if (file->f_mode & FMODE_WRITE) {
+                       if ((val = prog_dmabuf(state, 0)))
+                               return val;
+                       return put_user(dmabuf->fragsize, (int *)arg);
+               }
+               if (file->f_mode & FMODE_READ) {
+                       if ((val = prog_dmabuf(state, 1)))
+                               return val;
+                       return put_user(dmabuf->fragsize, (int *)arg);
+               }
+               return -EINVAL;
+
+       case SNDCTL_DSP_GETFMTS: /* Returns a mask of supported sample format*/
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_GETFMTS\n"); */
+               return put_user(AFMT_S16_LE|AFMT_U8, (int *)arg);
+
+       case SNDCTL_DSP_SETFMT: /* Select sample format */
+               get_user_ret(val, (int *)arg, -EFAULT);
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_SETFMT 0x%x\n", val); */
+               if (val == AFMT_S16_LE || val == AFMT_U8) {
+                       spin_lock_irqsave(&state->unit->reg_lock, flags);
+                       if (file->f_mode & FMODE_WRITE) {
+                               ymf_wait_dac(state);
+                       }
+#if HAVE_RECORD
+                       if (file->f_mode & FMODE_READ) {
+                               stop_adc(state);
+                       }
+#endif
+                       dmabuf->ready = 0;
+                       state->format.format = val;
+                       ymf_pcm_update_shift(&state->format);
+                       spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               }
+               return put_user(state->format.format, (int *)arg);
+
+       case SNDCTL_DSP_CHANNELS:
+               get_user_ret(val, (int *)arg, -EFAULT);
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_CHANNELS 0x%x\n", val); */
+               if (val != 0) {
+                       spin_lock_irqsave(&state->unit->reg_lock, flags);
+                       if (file->f_mode & FMODE_WRITE) {
+                               ymf_wait_dac(state);
+                               if (val == 1 || val == 2) {
+                                       dmabuf->ready = 0;
+                                       state->format.voices = val;
+                                       ymf_pcm_update_shift(&state->format);
+                               }
+                       }
+#if HAVE_RECORD
+                       if (file->f_mode & FMODE_READ) {
+                               stop_adc(state);
+                               dmabuf->ready = 0;
+                       }
+#endif
+                       spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               }
+               return put_user(state->format.voices, (int *)arg);
+
+       case SNDCTL_DSP_POST:
+               /*
+                * Quoting OSS PG:
+                *    The ioctl SNDCTL_DSP_POST is a lightweight version of
+                *    SNDCTL_DSP_SYNC. It just tells to the driver that there
+                *    is likely to be a pause in the output. This makes it
+                *    possible for the device to handle the pause more
+                *    intelligently. This ioctl doesn't block the application.
+                *
+                * The paragraph above is a clumsy way to say "flush ioctl".
+                * This ioctl is used by mpg123.
+                */
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_POST\n"); */
+               spin_lock_irqsave(&state->unit->reg_lock, flags);
+               if (dmabuf->count != 0 && !state->ypcm.running) {
+                       ymf_start_dac(state);
+               }
+               spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               return 0;
+
+       case SNDCTL_DSP_SUBDIVIDE:
+               if (dmabuf->subdivision)
+                       return -EINVAL;
+               get_user_ret(val, (int *)arg, -EFAULT);
+               if (val != 1 && val != 2)
+                       return -EINVAL;
+               dmabuf->subdivision = val;
+               return 0;
+
+       case SNDCTL_DSP_SETFRAGMENT:
+               get_user_ret(val, (int *)arg, -EFAULT);
+       /* P3: these frags are for Doom. Amasingly, it sets [2,2**11]. */
+       /* P3 */ printk("ymfpci: ioctl SNDCTL_DSP_SETFRAGMENT 0x%x\n", val);
+
+               dmabuf->ossfragshift = val & 0xffff;
+               dmabuf->ossmaxfrags = (val >> 16) & 0xffff;
+               switch (dmabuf->ossmaxfrags) {
+               case 1:
+                       dmabuf->ossfragshift = 12;
+                       return 0;
+               default:
+                       /* Fragments must be 2K long */
+                       dmabuf->ossfragshift = 11;
+                       dmabuf->ossmaxfrags = 2;
+               }
+               return 0;
+
+       case SNDCTL_DSP_GETOSPACE:
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_GETOSPACE\n"); */
+               if (!(file->f_mode & FMODE_WRITE))
+                       return -EINVAL;
+               if (!dmabuf->ready && (val = prog_dmabuf(state, 0)) != 0)
+                       return val;
+               spin_lock_irqsave(&state->unit->reg_lock, flags);
+               /* cs_update_ptr(state); */  /* XXX Always up to date? */
+               abinfo.fragsize = dmabuf->fragsize;
+               abinfo.bytes = dmabuf->dmasize - dmabuf->count;
+               abinfo.fragstotal = dmabuf->numfrag;
+               abinfo.fragments = abinfo.bytes >> dmabuf->fragshift;
+               spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               return copy_to_user((void *)arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
+
+#if HAVE_RECORD
+       case SNDCTL_DSP_GETISPACE:
+               if (!(file->f_mode & FMODE_READ))
+                       return -EINVAL;
+               if (!dmabuf->ready && (val = prog_dmabuf(state, 1)) != 0)
+                       return val;
+               spin_lock_irqsave(&state->card->lock, flags);
+               cs_update_ptr(state);
+               abinfo.fragsize = dmabuf->fragsize;
+               abinfo.bytes = dmabuf->count;
+               abinfo.fragstotal = dmabuf->numfrag;
+               abinfo.fragments = abinfo.bytes >> dmabuf->fragshift;
+               spin_unlock_irqrestore(&state->card->lock, flags);
+               return copy_to_user((void *)arg, &abinfo, sizeof(abinfo)) ? -EFAULT : 0;
+#endif
+
+       case SNDCTL_DSP_NONBLOCK:
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_NONBLOCK\n"); */
+               file->f_flags |= O_NONBLOCK;
+               return 0;
+
+       case SNDCTL_DSP_GETCAPS:
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_GETCAPS\n"); */
+               /* return put_user(DSP_CAP_REALTIME|DSP_CAP_TRIGGER|DSP_CAP_MMAP,
+                           (int *)arg); */
+               return put_user(0, (int *)arg);
+
+#if 0 /* old */
+       case SNDCTL_DSP_GETTRIGGER:
+               val = 0;
+               if (file->f_mode & FMODE_READ && dmabuf->enable)
+                       val |= PCM_ENABLE_INPUT;
+               if (file->f_mode & FMODE_WRITE && dmabuf->enable)
+                       val |= PCM_ENABLE_OUTPUT;
+               return put_user(val, (int *)arg);
+
+       case SNDCTL_DSP_SETTRIGGER:
+               get_user_ret(val, (int *)arg, -EFAULT);
+               if (file->f_mode & FMODE_READ) {
+                       if (val & PCM_ENABLE_INPUT) {
+                               if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
+                                       return ret;
+                               start_adc(state);
+                       } else
+                               stop_adc(state);
+               }
+               if (file->f_mode & FMODE_WRITE) {
+                       if (val & PCM_ENABLE_OUTPUT) {
+                               if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
+                                       return ret;
+                               start_dac(state);  // sure?
+                       } else
+                               stop_dac(state);
+               }
+               return 0;
+
+#endif
+
+#if HAVE_RECORD
+       case SNDCTL_DSP_GETIPTR:
+               if (!(file->f_mode & FMODE_READ))
+                       return -EINVAL;
+               spin_lock_irqsave(&state->unit->reg_lock, flags);
+               cs_update_ptr(state);
+               cinfo.bytes = dmabuf->total_bytes;
+               cinfo.blocks = dmabuf->count >> dmabuf->fragshift;
+               cinfo.ptr = dmabuf->hwptr;
+               if (dmabuf->mapped)
+                       dmabuf->count &= dmabuf->fragsize-1;
+               spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               return copy_to_user((void *)arg, &cinfo, sizeof(cinfo));
+#endif
+
+       case SNDCTL_DSP_GETOPTR:
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_GETOPTR\n"); */
+               if (!(file->f_mode & FMODE_WRITE))
+                       return -EINVAL;
+               spin_lock_irqsave(&state->unit->reg_lock, flags);
+               /* cs_update_ptr(state); */  /* Always up to date */
+               cinfo.bytes = dmabuf->total_bytes;
+               cinfo.blocks = dmabuf->count >> dmabuf->fragshift;
+               cinfo.ptr = dmabuf->hwptr;
+               if (dmabuf->mapped)
+                       dmabuf->count &= dmabuf->fragsize-1;
+               spin_unlock_irqrestore(&state->unit->reg_lock, flags);
+               return copy_to_user((void *)arg, &cinfo, sizeof(cinfo));
+
+       case SNDCTL_DSP_SETDUPLEX:      /* XXX TODO */
+       /* P3 */ /* printk("ymfpci: ioctl SNDCTL_DSP_SETDUPLEX\n"); */
+               return -EINVAL;
+
+#if 0 /* old */
+       case SNDCTL_DSP_GETODELAY:
+               if (!(file->f_mode & FMODE_WRITE))
+                       return -EINVAL;
+               spin_lock_irqsave(&state->unit->reg_lock, flags);
+               cs_update_ptr(state);
+               val = dmabuf->count;
+               spin_unlock_irqrestore(&state->card->lock, flags);
+               return put_user(val, (int *)arg);
+#endif
+
+       case SOUND_PCM_READ_RATE:
+               return put_user(state->format.rate, (int *)arg);
+
+       case SOUND_PCM_READ_CHANNELS:
+               return put_user(state->format.voices,   (int *)arg);
+
+       case SOUND_PCM_READ_BITS:
+               return put_user(AFMT_S16_LE, (int *)arg);
+
+       case SNDCTL_DSP_MAPINBUF:
+       case SNDCTL_DSP_MAPOUTBUF:
+       case SNDCTL_DSP_SETSYNCRO:
+       case SOUND_PCM_WRITE_FILTER:
+       case SOUND_PCM_READ_FILTER:
+               return -ENOTTY;
+
+       default:
+       /* P3 */ printk("ymfpci: ioctl cmd 0x%x\n", cmd);
+               /*
+                * Some programs mix up audio devices and ioctls
+                * or perhaps they expect "universal" ioctls,
+                * for instance we get SNDCTL_TMR_CONTINUE here.
+                * XXX Is there sound_generic_ioctl() around?
+                */
+       }
+       return -ENOTTY;
+}
+
+static int ymf_open(struct inode *inode, struct file *file)
+{
+       ymfpci_t *unit;
+       int minor, instance;
+       struct ymf_state *state;
+       int nvirt;
+       int err;
+
+       /*
+        * This is how we do it currently: only one channel is used
+        * in every board, so that we could use several boards in one machine.
+        * We waste 63 out of 64 playback slots, but so what.
+        * OSS model is constructed for devices with single playback channel.
+        */
+       minor = MINOR(inode->i_rdev);
+       if ((minor & 0x0F) == 3) {      /* /dev/dspN */
+               ;
+       } else {
+               return -ENXIO;
+       }
+       instance = (minor >> 4) & 0x0F;
+       nvirt = 0;                      /* Such is the partitioning of minor */
+
+       /* XXX Semaphore here! */
+       for (unit = ymf_devs; unit != NULL; unit = unit->next) {
+               if (unit->inst == instance) break;
+       }
+       if (unit == NULL) return -ENODEV;
+
+       if (unit->states[nvirt] != NULL) {
+               /* P3 */ printk("ymfpci%d: busy\n", unit->inst);
+               return -EBUSY;
+       }
+
+       if ((err = ymf_state_alloc(unit, nvirt, instance)) != 0) {
+               return err;
+       }
+       state = unit->states[nvirt];
+
+       file->private_data = state;
+
+       /*
+        * XXX This ymf_playback_prepare is totally unneeded here.
+        * The question is if we want to allow write to fail if
+        * prog_dmabuf fails... Say, no memory in DMA zone?
+        */
+       if ((err = ymf_playback_prepare(unit, state)) != 0) {
+               /* XXX This recovery is ugly as hell. */
+
+               ymf_pcm_free_substream(&state->ypcm);
+
+               unit->states[state->virt] = NULL;
+               kfree(state);
+
+               return err;
+       }
+
+#if 0 /* test if interrupts work */
+       ymfpci_writew(codec, YDSXGR_TIMERCOUNT, 0xfffe);        /* ~ 680ms */
+       ymfpci_writeb(codec, YDSXGR_TIMERCTRL,
+           (YDSXGR_TIMERCTRL_TEN|YDSXGR_TIMERCTRL_TIEN));
+#endif
+
+       MOD_INC_USE_COUNT;
+       return 0;
+}
+
+static int ymf_release(struct inode *inode, struct file *file)
+{
+       struct ymf_state *state = (struct ymf_state *)file->private_data;
+       ymfpci_t *codec = state->unit;
+
+#if 0 /* test if interrupts work */
+       ymfpci_writeb(codec, YDSXGR_TIMERCTRL, 0);
+#endif
+
+       /* XXX Use the semaphore to unrace us with opens */
+
+       if (state != codec->states[state->virt]) {
+               printk(KERN_ERR "ymfpci%d.%d: state mismatch\n",
+                   state->unit->inst, state->virt);
+               return -EIO;
+       }
+
+       /*
+        * XXX Solve the case of O_NONBLOCK close - don't deallocate here.
+        * Deallocate when unloading the driver and we can wait.
+        */
+       ymf_wait_dac(state);
+       dealloc_dmabuf(state);
+       ymf_pcm_free_substream(&state->ypcm);
+
+       codec->states[state->virt] = NULL;
+       kfree(state);
+
+       MOD_DEC_USE_COUNT;
+       return 0;
+}
+
+/*
+ * Mixer operations are based on cs46xx.
+ */
+static int ymf_open_mixdev(struct inode *inode, struct file *file)
+{
+       int i;
+       int minor = MINOR(inode->i_rdev);
+       ymfpci_t *codec;
+
+       for (codec = ymf_devs; codec != NULL; codec = codec->next) {
+               for (i = 0; i < NR_AC97; i++) {
+                       if (codec->ac97_codec[i] != NULL &&
+                           codec->ac97_codec[i]->dev_mixer == minor)
+                               goto match;
+               }
+       }
+       if (!codec)
+               return -ENODEV;
+
+ match:
+       file->private_data = codec->ac97_codec[i];
+
+       MOD_INC_USE_COUNT;
+       return 0;
+}
+
+static int ymf_ioctl_mixdev(struct inode *inode, struct file *file,
+    unsigned int cmd, unsigned long arg)
+{
+       struct ac97_codec *codec = (struct ac97_codec *)file->private_data;
+
+       return codec->mixer_ioctl(codec, cmd, arg);
+}
+
+static int ymf_release_mixdev(struct inode *inode, struct file *file)
+{
+       MOD_DEC_USE_COUNT;
+       return 0;
+}
+
+static /*const*/ struct file_operations ymf_fops = {
+       llseek:         ymf_llseek,
+       read:           ymf_read,
+       write:          ymf_write,
+       /* poll:                ymf_poll, */
+       ioctl:          ymf_ioctl,
+       mmap:           ymf_mmap,
+       open:           ymf_open,
+       release:        ymf_release,
+};
+
+static /*const*/ struct file_operations ymf_mixer_fops = {
+       llseek:         ymf_llseek,
+       ioctl:          ymf_ioctl_mixdev,
+       open:           ymf_open_mixdev,
+       release:        ymf_release_mixdev,
+};
+
+/*
+ *  initialization routines
+ */
+
+static void ymfpci_aclink_reset(struct pci_dev * pci)
+{
+       u8 cmd;
+
+       pci_read_config_byte(pci, PCIR_DSXGCTRL, &cmd);
+       if (cmd & 0x03) {
+               pci_write_config_byte(pci, PCIR_DSXGCTRL, cmd & 0xfc);
+               pci_write_config_byte(pci, PCIR_DSXGCTRL, cmd | 0x03);
+               pci_write_config_byte(pci, PCIR_DSXGCTRL, cmd & 0xfc);
+       }
+}
+
+static void ymfpci_enable_dsp(ymfpci_t *codec)
+{
+       ymfpci_writel(codec, YDSXGR_CONFIG, 0x00000001);
+}
+
+static void ymfpci_disable_dsp(ymfpci_t *codec)
+{
+       u32 val;
+       int timeout = 1000;
+
+       val = ymfpci_readl(codec, YDSXGR_CONFIG);
+       if (val)
+               ymfpci_writel(codec, YDSXGR_CONFIG, 0x00000000);
+       while (timeout-- > 0) {
+               val = ymfpci_readl(codec, YDSXGR_CONFIG);
+               if ((val & 0x00000002) == 0)
+                       break;
+       }
+}
+
+#include "ymfpci_image.h"
+
+static void ymfpci_download_image(ymfpci_t *codec)
+{
+       int i, ver_1e;
+       u16 ctrl;
+
+       ymfpci_writel(codec, YDSXGR_NATIVEDACOUTVOL, 0x00000000);
+       ymfpci_disable_dsp(codec);
+       ymfpci_writel(codec, YDSXGR_MODE, 0x00010000);
+       ymfpci_writel(codec, YDSXGR_MODE, 0x00000000);
+       ymfpci_writel(codec, YDSXGR_MAPOFREC, 0x00000000);
+       ymfpci_writel(codec, YDSXGR_MAPOFEFFECT, 0x00000000);
+       ymfpci_writel(codec, YDSXGR_PLAYCTRLBASE, 0x00000000);
+       ymfpci_writel(codec, YDSXGR_RECCTRLBASE, 0x00000000);
+       ymfpci_writel(codec, YDSXGR_EFFCTRLBASE, 0x00000000);
+       ctrl = ymfpci_readw(codec, YDSXGR_GLOBALCTRL);
+       ymfpci_writew(codec, YDSXGR_GLOBALCTRL, ctrl & ~0x0007);
+
+       /* setup DSP instruction code */
+       for (i = 0; i < YDSXG_DSPLENGTH; i++)
+               ymfpci_writel(codec, YDSXGR_DSPINSTRAM + i, DspInst[i >> 2]);
+
+       switch (codec->device_id) {
+       case PCI_DEVICE_ID_YAMAHA_724F:
+       case PCI_DEVICE_ID_YAMAHA_740C:
+       case PCI_DEVICE_ID_YAMAHA_744:
+       case PCI_DEVICE_ID_YAMAHA_754:
+               ver_1e = 1;
+               break;
+       default:
+               ver_1e = 0;
+       }
+
+       if (ver_1e) {
+               /* setup control instruction code */
+               for (i = 0; i < YDSXG_CTRLLENGTH; i++)
+                       ymfpci_writel(codec, YDSXGR_CTRLINSTRAM + i, CntrlInst1E[i >> 2]);
+       } else {
+               for (i = 0; i < YDSXG_CTRLLENGTH; i++)
+                       ymfpci_writel(codec, YDSXGR_CTRLINSTRAM + i, CntrlInst[i >> 2]);
+       }
+
+       ymfpci_enable_dsp(codec);
+}
+
+static int ymfpci_memalloc(ymfpci_t *codec)
+{
+       long size, playback_ctrl_size;
+       int voice, bank;
+       u8 *ptr;
+
+       playback_ctrl_size = 4 + 4 * YDSXG_PLAYBACK_VOICES;
+       codec->bank_size_playback = ymfpci_readl(codec, YDSXGR_PLAYCTRLSIZE) << 2;
+       codec->bank_size_capture = ymfpci_readl(codec, YDSXGR_RECCTRLSIZE) << 2;
+       codec->bank_size_effect = ymfpci_readl(codec, YDSXGR_EFFCTRLSIZE) << 2;
+       codec->work_size = YDSXG_DEFAULT_WORK_SIZE;
+
+       size = ((playback_ctrl_size + 0x00ff) & ~0x00ff) +
+           ((codec->bank_size_playback * 2 * YDSXG_PLAYBACK_VOICES + 0xff) & ~0xff) +
+           ((codec->bank_size_capture * 2 * YDSXG_CAPTURE_VOICES + 0xff) & ~0xff) +
+           ((codec->bank_size_effect * 2 * YDSXG_EFFECT_VOICES + 0xff) & ~0xff) +
+           codec->work_size;
+
+       ptr = (u8 *)kmalloc(size + 0x00ff, GFP_KERNEL);
+       if (ptr == NULL)
+               return -ENOMEM;
+
+       codec->work_ptr = ptr;
+       ptr += 0x00ff;
+       (long)ptr &= ~0x00ff;
+
+       codec->bank_base_playback = ptr;
+       codec->ctrl_playback = (u32 *)ptr;
+       codec->ctrl_playback[0] = YDSXG_PLAYBACK_VOICES;
+       ptr += (playback_ctrl_size + 0x00ff) & ~0x00ff;
+       for (voice = 0; voice < YDSXG_PLAYBACK_VOICES; voice++) {
+               for (bank = 0; bank < 2; bank++) {
+                       codec->bank_playback[voice][bank] = (ymfpci_playback_bank_t *)ptr;
+                       ptr += codec->bank_size_playback;
+               }
+               codec->voices[voice].number = voice;
+               codec->voices[voice].bank = codec->bank_playback[voice][0];
+       }
+       ptr += (codec->bank_size_playback + 0x00ff) & ~0x00ff;
+       codec->bank_base_capture = ptr;
+       for (voice = 0; voice < YDSXG_CAPTURE_VOICES; voice++)
+               for (bank = 0; bank < 2; bank++) {
+                       codec->bank_capture[voice][bank] = (ymfpci_capture_bank_t *)ptr;
+                       ptr += codec->bank_size_capture;
+               }
+       ptr += (codec->bank_size_capture + 0x00ff) & ~0x00ff;
+       codec->bank_base_effect = ptr;
+       for (voice = 0; voice < YDSXG_EFFECT_VOICES; voice++)
+               for (bank = 0; bank < 2; bank++) {
+                       codec->bank_effect[voice][bank] = (ymfpci_effect_bank_t *)ptr;
+                       ptr += codec->bank_size_effect;
+               }
+       ptr += (codec->bank_size_effect + 0x00ff) & ~0x00ff;
+       codec->work_base = ptr;
+
+       ymfpci_writel(codec, YDSXGR_PLAYCTRLBASE, virt_to_bus(codec->bank_base_playback));
+       ymfpci_writel(codec, YDSXGR_RECCTRLBASE, virt_to_bus(codec->bank_base_capture));
+       ymfpci_writel(codec, YDSXGR_EFFCTRLBASE, virt_to_bus(codec->bank_base_effect));
+       ymfpci_writel(codec, YDSXGR_WORKBASE, virt_to_bus(codec->work_base));
+       ymfpci_writel(codec, YDSXGR_WORKSIZE, codec->work_size >> 2);
+
+       /* S/PDIF output initialization */
+       ymfpci_writew(codec, YDSXGR_SPDIFOUTCTRL, 0);
+       ymfpci_writew(codec, YDSXGR_SPDIFOUTSTATUS,
+               SND_PCM_AES0_CON_EMPHASIS_NONE |
+               (SND_PCM_AES1_CON_ORIGINAL << 8) |
+               (SND_PCM_AES1_CON_PCM_CODER << 8));
+
+       /* S/PDIF input initialization */
+       ymfpci_writew(codec, YDSXGR_SPDIFINCTRL, 0);
+
+       /* move this volume setup to mixer */
+       ymfpci_writel(codec, YDSXGR_NATIVEDACOUTVOL, 0x3fff3fff);
+       ymfpci_writel(codec, YDSXGR_BUF441OUTVOL, 0x3fff3fff);
+       ymfpci_writel(codec, YDSXGR_NATIVEADCINVOL, 0x3fff3fff);
+       ymfpci_writel(codec, YDSXGR_NATIVEDACINVOL, 0x3fff3fff);
+
+       return 0;
+}
+
+static int ymf_ac97_init(ymfpci_t *card, int num_ac97)
+{
+       struct ac97_codec *codec;
+       u16 eid;
+
+       if ((codec = kmalloc(sizeof(struct ac97_codec), GFP_KERNEL)) == NULL)
+               return -ENOMEM;
+       memset(codec, 0, sizeof(struct ac97_codec));
+
+       /* initialize some basic codec information, other fields will be filled
+          in ac97_probe_codec */
+       codec->private_data = card;
+       codec->id = num_ac97;
+
+       codec->codec_read = ymfpci_codec_read;
+       codec->codec_write = ymfpci_codec_write;
+
+       if (ac97_probe_codec(codec) == 0) {
+               /* Alan does not have this printout. P3 */
+               printk("ymfpci: ac97_probe_codec failed\n");
+               return -ENODEV;
+       }
+
+       eid = ymfpci_codec_read(codec, AC97_EXTENDED_ID);
+
+       if (eid==0xFFFFFF)
+       {
+               printk(KERN_WARNING "ymfpci: no codec attached ?\n");
+               kfree(codec);
+               return -ENODEV;
+       }
+
+       card->ac97_features = eid;
+
+       if ((codec->dev_mixer = register_sound_mixer(&ymf_mixer_fops, -1)) < 0) {
+               printk(KERN_ERR "ymfpci: couldn't register mixer!\n");
+               kfree(codec);
+               return -ENODEV;
+       }
+
+       card->ac97_codec[num_ac97] = codec;
+
+       return 0;
+}
+
+static int /* __init */
+ymf_install(struct pci_dev *pcidev, int instance, int devx)
+{
+       ymfpci_t *codec;
+
+       int err;
+
+       if ((codec = kmalloc(sizeof(ymfpci_t), GFP_KERNEL)) == NULL) {
+               printk(KERN_ERR "ymfpci: no core\n");
+               return -ENOMEM;
+       }
+       memset(codec, 0, sizeof(*codec));
+
+       spin_lock_init(&codec->reg_lock);
+       spin_lock_init(&codec->voice_lock);
+       codec->pci = pcidev;
+       codec->inst = instance;
+       codec->irq = pcidev->irq;
+       codec->device_id = pcidev->device;
+       pci_read_config_byte(pcidev, PCI_REVISION_ID, (u8 *)&codec->rev);
+       codec->reg_area_phys = pcidev->base_address[0]&PCI_BASE_ADDRESS_MEM_MASK;
+       codec->reg_area_virt = (unsigned long)ioremap(codec->reg_area_phys, 0x8000);
+       pci_set_master(pcidev);
+
+       /* XXX KERN_INFO */
+       printk("ymfpci%d: %s at 0x%lx IRQ %d\n", instance,
+           ymf_devv[devx].name, codec->reg_area_phys, codec->irq);
+
+       ymfpci_aclink_reset(pcidev);
+       if (ymfpci_codec_ready(codec, 0, 1) < 0) {
+               ymfpci_free(codec);
+               return -ENODEV;
+       }
+
+       ymfpci_download_image(codec);
+
+       udelay(100); /* seems we need some delay after downloading image.. */
+
+       if (ymfpci_memalloc(codec) < 0) {
+               ymfpci_free(codec);
+               return -ENODEV;
+       }
+
+       /* ymfpci_proc_init(card, codec); */
+
+       if (request_irq(codec->irq, ymf_interrupt, SA_SHIRQ, "ymfpci", codec) != 0) {
+               printk(KERN_ERR "ymfpci%d: unable to request IRQ %d\n",
+                   codec->inst, codec->irq);
+               ymfpci_free(codec);
+               return -ENODEV;
+       }
+
+       /* register /dev/dsp */
+       if ((codec->dev_audio = register_sound_dsp(&ymf_fops, -1)) < 0) {
+               printk(KERN_ERR "ymfpci%d: unable to register dsp\n", codec->inst);
+               ymfpci_free(codec);
+               return -ENODEV;
+       }
+
+       /*
+        * Poke just the primary for the moment.
+        */
+       if ((err = ymf_ac97_init(codec, 0)) != 0) {
+               unregister_sound_dsp(codec->dev_audio);
+               ymfpci_free(codec);
+               return err;
+       }
+
+       codec->next = ymf_devs;
+       ymf_devs = codec;
+
+       return 0;
+}
+
+static void
+ymfpci_free(ymfpci_t *codec)
+{
+       u16 ctrl;
+
+       /* ymfpci_proc_done(codec); */
+
+       unregister_sound_dsp(codec->dev_audio);
+
+       ymfpci_writel(codec, YDSXGR_NATIVEDACOUTVOL, 0);
+       ymfpci_writel(codec, YDSXGR_BUF441OUTVOL, 0);
+       ymfpci_writel(codec, YDSXGR_STATUS, ~0);
+       ymfpci_disable_dsp(codec);
+       ymfpci_writel(codec, YDSXGR_PLAYCTRLBASE, 0);
+       ymfpci_writel(codec, YDSXGR_RECCTRLBASE, 0);
+       ymfpci_writel(codec, YDSXGR_EFFCTRLBASE, 0);
+       ymfpci_writel(codec, YDSXGR_WORKBASE, 0);
+       ymfpci_writel(codec, YDSXGR_WORKSIZE, 0);
+       ctrl = ymfpci_readw(codec, YDSXGR_GLOBALCTRL);
+       ymfpci_writew(codec, YDSXGR_GLOBALCTRL, ctrl & ~0x0007);
+
+       if (codec->reg_area_virt)
+               iounmap((void *)codec->reg_area_virt);
+       if (codec->work_ptr)
+               kfree(codec->work_ptr);
+       kfree(codec);
+}
+
+MODULE_AUTHOR("Jaroslav Kysela");
+MODULE_DESCRIPTION("Yamaha YMF7xx PCI Audio");
+
+int /* __init */
+ymf_probe(void)
+{
+       struct pci_dev *pcidev;
+       int foundone;
+       int i;
+
+       if (!pci_present())
+               return -ENODEV;
+
+       /*
+        * Print our proud ego-nursing "Hello, World!" message as in MS-DOS.
+        */
+       /* printk(KERN_INFO "ymfpci: Yamaha YMF7xx\n"); */
+
+       /*
+        * Not very efficient, but Alan did it so in cs46xx.c.
+        */
+       foundone = 0;
+       pcidev = NULL;
+       for (i = 0; i < sizeof(ymf_devv)/sizeof(ymf_devv[0]); i++) {
+               while ((pcidev = pci_find_device(PCI_VENDOR_ID_YAMAHA,
+                   ymf_devv[i].id, pcidev)) != NULL) {
+                       if (ymf_install(pcidev, foundone, i) == 0) {
+                               foundone++;
+                       }
+               }
+       }
+
+       return foundone;
+}
+
+#ifdef MODULE
+
+int init_module(void)
+{
+       if (ymf_probe()==0)
+               printk(KERN_ERR "ymfpci: No devices found.\n");
+       return 0;
+}
+
+void cleanup_module (void)
+{
+       ymfpci_t *next;
+
+       while (ymf_devs){
+               next = ymf_devs->next;
+               ymfpci_free(ymf_devs);
+               ymf_devs = next;
+       }
+}
+
+#endif
diff --git a/drivers/sound/ymfpci.h b/drivers/sound/ymfpci.h
new file mode 100644 (file)
index 0000000..29b611f
--- /dev/null
@@ -0,0 +1,351 @@
+#ifndef __YMFPCI_H
+#define __YMFPCI_H
+
+/*
+ *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Definitions for Yahama YMF724/740/744/754 chips
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/*
+ *  Direct registers
+ */
+
+/* #define YMFREG(codec, reg)          (codec->port + YDSXGR_##reg) */
+
+#define        YDSXGR_INTFLAG                  0x0004
+#define        YDSXGR_ACTIVITY                 0x0006
+#define        YDSXGR_GLOBALCTRL               0x0008
+#define        YDSXGR_ZVCTRL                   0x000A
+#define        YDSXGR_TIMERCTRL                0x0010
+#define        YDSXGR_TIMERCTRL_TEN             0x0001
+#define        YDSXGR_TIMERCTRL_TIEN            0x0002
+#define        YDSXGR_TIMERCOUNT               0x0012
+#define        YDSXGR_SPDIFOUTCTRL             0x0018
+#define        YDSXGR_SPDIFOUTSTATUS           0x001C
+#define        YDSXGR_EEPROMCTRL               0x0020
+#define        YDSXGR_SPDIFINCTRL              0x0034
+#define        YDSXGR_SPDIFINSTATUS            0x0038
+#define        YDSXGR_DSPPROGRAMDL             0x0048
+#define        YDSXGR_DLCNTRL                  0x004C
+#define        YDSXGR_GPIOININTFLAG            0x0050
+#define        YDSXGR_GPIOININTENABLE          0x0052
+#define        YDSXGR_GPIOINSTATUS             0x0054
+#define        YDSXGR_GPIOOUTCTRL              0x0056
+#define        YDSXGR_GPIOFUNCENABLE           0x0058
+#define        YDSXGR_GPIOTYPECONFIG           0x005A
+#define        YDSXGR_AC97CMDDATA              0x0060
+#define        YDSXGR_AC97CMDADR               0x0062
+#define        YDSXGR_PRISTATUSDATA            0x0064
+#define        YDSXGR_PRISTATUSADR             0x0066
+#define        YDSXGR_SECSTATUSDATA            0x0068
+#define        YDSXGR_SECSTATUSADR             0x006A
+#define        YDSXGR_SECCONFIG                0x0070
+#define        YDSXGR_LEGACYOUTVOL             0x0080
+#define        YDSXGR_LEGACYOUTVOLL            0x0080
+#define        YDSXGR_LEGACYOUTVOLR            0x0082
+#define        YDSXGR_NATIVEDACOUTVOL          0x0084
+#define        YDSXGR_NATIVEDACOUTVOLL         0x0084
+#define        YDSXGR_NATIVEDACOUTVOLR         0x0086
+#define        YDSXGR_SPDIFOUTVOL              0x0088
+#define        YDSXGR_SPDIFOUTVOLL             0x0088
+#define        YDSXGR_SPDIFOUTVOLR             0x008A
+#define        YDSXGR_AC3OUTVOL                0x008C
+#define        YDSXGR_AC3OUTVOLL               0x008C
+#define        YDSXGR_AC3OUTVOLR               0x008E
+#define        YDSXGR_PRIADCOUTVOL             0x0090
+#define        YDSXGR_PRIADCOUTVOLL            0x0090
+#define        YDSXGR_PRIADCOUTVOLR            0x0092
+#define        YDSXGR_LEGACYLOOPVOL            0x0094
+#define        YDSXGR_LEGACYLOOPVOLL           0x0094
+#define        YDSXGR_LEGACYLOOPVOLR           0x0096
+#define        YDSXGR_NATIVEDACLOOPVOL         0x0098
+#define        YDSXGR_NATIVEDACLOOPVOLL        0x0098
+#define        YDSXGR_NATIVEDACLOOPVOLR        0x009A
+#define        YDSXGR_SPDIFLOOPVOL             0x009C
+#define        YDSXGR_SPDIFLOOPVOLL            0x009E
+#define        YDSXGR_SPDIFLOOPVOLR            0x009E
+#define        YDSXGR_AC3LOOPVOL               0x00A0
+#define        YDSXGR_AC3LOOPVOLL              0x00A0
+#define        YDSXGR_AC3LOOPVOLR              0x00A2
+#define        YDSXGR_PRIADCLOOPVOL            0x00A4
+#define        YDSXGR_PRIADCLOOPVOLL           0x00A4
+#define        YDSXGR_PRIADCLOOPVOLR           0x00A6
+#define        YDSXGR_NATIVEADCINVOL           0x00A8
+#define        YDSXGR_NATIVEADCINVOLL          0x00A8
+#define        YDSXGR_NATIVEADCINVOLR          0x00AA
+#define        YDSXGR_NATIVEDACINVOL           0x00AC
+#define        YDSXGR_NATIVEDACINVOLL          0x00AC
+#define        YDSXGR_NATIVEDACINVOLR          0x00AE
+#define        YDSXGR_BUF441OUTVOL             0x00B0
+#define        YDSXGR_BUF441OUTVOLL            0x00B0
+#define        YDSXGR_BUF441OUTVOLR            0x00B2
+#define        YDSXGR_BUF441LOOPVOL            0x00B4
+#define        YDSXGR_BUF441LOOPVOLL           0x00B4
+#define        YDSXGR_BUF441LOOPVOLR           0x00B6
+#define        YDSXGR_SPDIFOUTVOL2             0x00B8
+#define        YDSXGR_SPDIFOUTVOL2L            0x00B8
+#define        YDSXGR_SPDIFOUTVOL2R            0x00BA
+#define        YDSXGR_SPDIFLOOPVOL2            0x00BC
+#define        YDSXGR_SPDIFLOOPVOL2L           0x00BC
+#define        YDSXGR_SPDIFLOOPVOL2R           0x00BE
+#define        YDSXGR_ADCSLOTSR                0x00C0
+#define        YDSXGR_RECSLOTSR                0x00C4
+#define        YDSXGR_ADCFORMAT                0x00C8
+#define        YDSXGR_RECFORMAT                0x00CC
+#define        YDSXGR_P44SLOTSR                0x00D0
+#define        YDSXGR_STATUS                   0x0100
+#define        YDSXGR_CTRLSELECT               0x0104
+#define        YDSXGR_MODE                     0x0108
+#define        YDSXGR_SAMPLECOUNT              0x010C
+#define        YDSXGR_NUMOFSAMPLES             0x0110
+#define        YDSXGR_CONFIG                   0x0114
+#define        YDSXGR_PLAYCTRLSIZE             0x0140
+#define        YDSXGR_RECCTRLSIZE              0x0144
+#define        YDSXGR_EFFCTRLSIZE              0x0148
+#define        YDSXGR_WORKSIZE                 0x014C
+#define        YDSXGR_MAPOFREC                 0x0150
+#define        YDSXGR_MAPOFEFFECT              0x0154
+#define        YDSXGR_PLAYCTRLBASE             0x0158
+#define        YDSXGR_RECCTRLBASE              0x015C
+#define        YDSXGR_EFFCTRLBASE              0x0160
+#define        YDSXGR_WORKBASE                 0x0164
+#define        YDSXGR_DSPINSTRAM               0x1000
+#define        YDSXGR_CTRLINSTRAM              0x4000
+
+#define YDSXG_AC97READCMD              0x8000
+#define YDSXG_AC97WRITECMD             0x0000
+
+#define PCIR_DSXGCTRL                  0x48
+
+#define YDSXG_DSPLENGTH                        0x0080
+#define YDSXG_CTRLLENGTH               0x3000
+
+#define YDSXG_DEFAULT_WORK_SIZE                0x0400
+
+#define YDSXG_PLAYBACK_VOICES          64
+#define YDSXG_CAPTURE_VOICES           2
+#define YDSXG_EFFECT_VOICES            5
+
+/* maxinum number of AC97 codecs connected, AC97 2.0 defined 4 */
+#define NR_AC97                2
+
+#define YMF_SAMPF                      256     /* Samples per frame @48000 */
+
+/*
+ * The slot/voice control bank (2 of these per voice)
+ */
+
+typedef struct stru_ymfpci_playback_bank {
+       u32 format;
+       u32 loop_default;
+       u32 base;                       /* 32-bit address */
+       u32 loop_start;                 /* 32-bit offset */
+       u32 loop_end;                   /* 32-bit offset */
+       u32 loop_frac;                  /* 8-bit fraction - loop_start */
+       u32 delta_end;                  /* pitch delta end */
+       u32 lpfK_end;
+       u32 eg_gain_end;
+       u32 left_gain_end;
+       u32 right_gain_end;
+       u32 eff1_gain_end;
+       u32 eff2_gain_end;
+       u32 eff3_gain_end;
+       u32 lpfQ;
+       u32 status;             /* P3: Always 0 for some reason. */
+       u32 num_of_frames;
+       u32 loop_count;
+       u32 start;              /* P3: J. reads this to know where chip is. */
+       u32 start_frac;
+       u32 delta;
+       u32 lpfK;
+       u32 eg_gain;
+       u32 left_gain;
+       u32 right_gain;
+       u32 eff1_gain;
+       u32 eff2_gain;
+       u32 eff3_gain;
+       u32 lpfD1;
+       u32 lpfD2;
+} ymfpci_playback_bank_t;
+
+typedef struct stru_ymfpci_capture_bank {
+       u32 base;                       /* 32-bit address */
+       u32 loop_end;                   /* 32-bit offset */
+       u32 start;                      /* 32-bit offset */
+       u32 num_of_loops;               /* counter */
+} ymfpci_capture_bank_t;
+
+typedef struct stru_ymfpci_effect_bank {
+       u32 base;                       /* 32-bit address */
+       u32 loop_end;                   /* 32-bit offset */
+       u32 start;                      /* 32-bit offset */
+       u32 temp;
+} ymfpci_effect_bank_t;
+
+typedef struct stru_ymfpci_voice ymfpci_voice_t;
+typedef struct ymf_pcm ymfpci_pcm_t;
+/*
+ * Throughout the code Yaroslav names YMF unit pointer "codec"
+ * even though it does not correspond to any codec. Must be historic.
+ * We replace it with "unit" over time.
+ * AC97 parts use "codec" to denote a codec, naturally.
+ */
+typedef struct ymf_unit ymfpci_t;
+
+typedef enum {
+       YMFPCI_PCM,
+       YMFPCI_SYNTH,
+       YMFPCI_MIDI
+} ymfpci_voice_type_t;
+
+struct stru_ymfpci_voice {
+       ymfpci_t *codec;
+       int number;
+       int use: 1,
+           pcm: 1,
+           synth: 1,
+           midi: 1;
+       ymfpci_playback_bank_t *bank;
+       void (*interrupt)(ymfpci_t *codec, ymfpci_voice_t *voice);
+       ymfpci_pcm_t *ypcm;
+};
+
+typedef enum {
+       PLAYBACK_VOICE,
+       CAPTURE_REC,
+       CAPTURE_AC97,
+       EFFECT_DRY_LEFT,
+       EFFECT_DRY_RIGHT,
+       EFFECT_EFF1,
+       EFFECT_EFF2,
+       EFFECT_EFF3
+} ymfpci_pcm_type_t;
+
+struct ymf_pcm {
+       ymfpci_t *codec;
+       ymfpci_pcm_type_t type;
+       struct ymf_state *state;
+       ymfpci_voice_t *voices[2];      /* playback only */
+       int running;                    // +
+       int spdif;
+};
+
+struct ymf_unit {
+       unsigned int device_id; /* PCI device ID */
+       unsigned int rev;       /* PCI revision */
+       unsigned long reg_area_phys;
+       unsigned long reg_area_virt;
+
+       void *work_ptr;                         // +
+
+       unsigned int bank_size_playback;
+       unsigned int bank_size_capture;
+       unsigned int bank_size_effect;
+       unsigned int work_size;
+
+       void *bank_base_playback;               // +
+       void *bank_base_capture;                // +
+       void *bank_base_effect;                 // +
+       void *work_base;                        // +
+
+       u32 *ctrl_playback;
+       ymfpci_playback_bank_t *bank_playback[YDSXG_PLAYBACK_VOICES][2];
+       ymfpci_capture_bank_t *bank_capture[YDSXG_CAPTURE_VOICES][2];
+       ymfpci_effect_bank_t *bank_effect[YDSXG_EFFECT_VOICES][2];
+
+       int start_count;
+
+       u32 active_bank;
+       ymfpci_voice_t voices[64];
+
+       struct ac97_codec *ac97_codec[NR_AC97];
+       u16 ac97_features;
+
+       struct pci_dev *pci;
+       int irq;
+       int inst;               /* Unit number (instance) */
+
+       spinlock_t reg_lock;
+       spinlock_t voice_lock;
+
+       /* soundcore stuff */
+       int dev_audio;
+
+       ymfpci_t *next;                                 // *
+       struct ymf_state *states[1];                    // *
+       /* ypcm may be the same thing as state, but not for record, effects. */
+};
+
+/*
+ * "Software" or virtual channel, an instance of opened /dev/dsp.
+ */
+
+struct ymf_dmabuf {
+
+       /* OSS buffer management stuff */
+       void *rawbuf;
+       unsigned buforder;
+       unsigned numfrag;
+       unsigned fragshift;
+
+       /* our buffer acts like a circular ring */
+       unsigned hwptr;         /* where dma last started */
+       unsigned swptr;         /* where driver last clear/filled */
+       int count;              /* fill count */
+       unsigned total_bytes;   /* total bytes dmaed by hardware */
+
+       unsigned error;         /* number of over/underruns */
+       struct wait_queue *wait;        /* put process on wait queue when no more space in buffer */
+
+       /* redundant, but makes calculations easier */
+       unsigned fragsize;
+       unsigned dmasize;       /* Total rawbuf[] size */
+       unsigned fragsamples;
+
+       /* OSS stuff */
+       unsigned mapped:1;
+       unsigned ready:1;
+       unsigned ossfragshift;
+       int ossmaxfrags;
+       unsigned subdivision;
+};
+
+struct ymf_pcm_format {
+       int format;                     /* OSS format */
+       int rate;                       /* rate in Hz */
+       int voices;                     /* number of voices */
+       int shift;                      /* redundant, computed from the above */
+};
+
+struct ymf_state {
+       struct ymf_unit *unit;                  /* backpointer */
+
+       /* single open lock mechanism, only used for recording */
+       struct semaphore open_sem;
+       struct wait_queue *open_wait;
+
+       /* virtual channel number */
+       int virt;                               // * unused a.t.m.
+
+       struct ymf_pcm ypcm;                    // *
+       struct ymf_dmabuf dmabuf;               // *
+       struct ymf_pcm_format format;           // *
+};
+
+#endif                         /* __YMFPCI_H */
diff --git a/drivers/sound/ymfpci_image.h b/drivers/sound/ymfpci_image.h
new file mode 100644 (file)
index 0000000..2cef1e1
--- /dev/null
@@ -0,0 +1,1565 @@
+#ifndef _HWMCODE_
+#define _HWMCODE_
+
+static unsigned long int       DspInst[] = {
+       0x00000081, 0x000001a4, 0x0000000a, 0x0000002f,
+       0x00080253, 0x01800317, 0x0000407b, 0x0000843f,
+       0x0001483c, 0x0001943c, 0x0005d83c, 0x00001c3c,
+       0x0000c07b, 0x00050c3f, 0x0121503c, 0x00000000,
+       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x00000000, 0x00000000, 0x00000000
+};
+
+static unsigned long int       CntrlInst[] = {
+       0x000007, 0x240007, 0x0C0007, 0x1C0007,
+       0x060007, 0x700002, 0x000020, 0x030040,
+       0x007104, 0x004286, 0x030040, 0x000F0D,
+       0x000810, 0x20043A, 0x000282, 0x00020D,
+       0x000810, 0x20043A, 0x001282, 0x200E82,
+       0x001A82, 0x032D0D, 0x000810, 0x10043A,
+       0x02D38D, 0x000810, 0x18043A, 0x00010D,
+       0x020015, 0x0000FD, 0x000020, 0x038860,
+       0x039060, 0x038060, 0x038040, 0x038040,
+       0x038040, 0x018040, 0x000A7D, 0x038040,
+       0x038040, 0x018040, 0x200402, 0x000882,
+       0x08001A, 0x000904, 0x015986, 0x000007,
+       0x260007, 0x000007, 0x000007, 0x018A06,
+       0x000007, 0x030C8D, 0x000810, 0x18043A,
+       0x260007, 0x00087D, 0x018042, 0x00160A,
+       0x04A206, 0x000007, 0x00218D, 0x000810,
+       0x08043A, 0x21C206, 0x000007, 0x0007FD,
+       0x018042, 0x08000A, 0x000904, 0x029386,
+       0x000195, 0x090D04, 0x000007, 0x000820,
+       0x0000F5, 0x000B7D, 0x01F060, 0x0000FD,
+       0x032206, 0x018040, 0x000A7D, 0x038042,
+       0x13804A, 0x18000A, 0x001820, 0x059060,
+       0x058860, 0x018040, 0x0000FD, 0x018042,
+       0x70000A, 0x000115, 0x071144, 0x032386,
+       0x030000, 0x007020, 0x034A06, 0x018040,
+       0x00348D, 0x000810, 0x08043A, 0x21EA06,
+       0x000007, 0x02D38D, 0x000810, 0x18043A,
+       0x018206, 0x000007, 0x240007, 0x000F8D,
+       0x000810, 0x00163A, 0x002402, 0x005C02,
+       0x0028FD, 0x000020, 0x018040, 0x08000D,
+       0x000815, 0x510984, 0x000007, 0x00004D,
+       0x000E5D, 0x000E02, 0x00418D, 0x000810,
+       0x08043A, 0x2C8A06, 0x000007, 0x00008D,
+       0x000924, 0x000F02, 0x00458D, 0x000810,
+       0x08043A, 0x2C8A06, 0x000007, 0x00387D,
+       0x018042, 0x08000A, 0x001015, 0x010984,
+       0x018386, 0x000007, 0x01AA06, 0x000007,
+       0x0008FD, 0x018042, 0x18000A, 0x001904,
+       0x218086, 0x280007, 0x001810, 0x28043A,
+       0x280C02, 0x00000D, 0x000810, 0x28143A,
+       0x08808D, 0x000820, 0x0002FD, 0x018040,
+       0x200007, 0x00020D, 0x189904, 0x000007,
+       0x00402D, 0x0000BD, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x055A86, 0x000007,
+       0x000100, 0x000A20, 0x00047D, 0x018040,
+       0x018042, 0x20000A, 0x003015, 0x012144,
+       0x034986, 0x000007, 0x002104, 0x034986,
+       0x000007, 0x000F8D, 0x000810, 0x280C3A,
+       0x023944, 0x06C986, 0x000007, 0x001810,
+       0x28043A, 0x08810D, 0x000820, 0x0002FD,
+       0x018040, 0x200007, 0x002810, 0x78003A,
+       0x00688D, 0x000810, 0x08043A, 0x288A06,
+       0x000007, 0x00400D, 0x001015, 0x189904,
+       0x292904, 0x393904, 0x000007, 0x060206,
+       0x000007, 0x0004F5, 0x00007D, 0x000020,
+       0x00008D, 0x010860, 0x018040, 0x00047D,
+       0x038042, 0x21804A, 0x18000A, 0x021944,
+       0x215886, 0x000007, 0x004075, 0x71F104,
+       0x000007, 0x010042, 0x28000A, 0x002904,
+       0x212086, 0x000007, 0x003C0D, 0x30A904,
+       0x000007, 0x00077D, 0x018042, 0x08000A,
+       0x000904, 0x07DA86, 0x00057D, 0x002820,
+       0x03B060, 0x07F206, 0x018040, 0x003020,
+       0x03A860, 0x018040, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x07FA86, 0x000007,
+       0x00057D, 0x018042, 0x28040A, 0x000E8D,
+       0x000810, 0x280C3A, 0x00000D, 0x000810,
+       0x28143A, 0x09000D, 0x000820, 0x0002FD,
+       0x018040, 0x200007, 0x003DFD, 0x000020,
+       0x018040, 0x00107D, 0x008D8D, 0x000810,
+       0x08043A, 0x288A06, 0x000007, 0x000815,
+       0x08001A, 0x010984, 0x095186, 0x00137D,
+       0x200500, 0x280F20, 0x338F60, 0x3B8F60,
+       0x438F60, 0x4B8F60, 0x538F60, 0x5B8F60,
+       0x038A60, 0x018040, 0x007FBD, 0x383DC4,
+       0x000007, 0x001A7D, 0x001375, 0x018042,
+       0x09004A, 0x10000A, 0x0B8D04, 0x139504,
+       0x000007, 0x000820, 0x019060, 0x001104,
+       0x212086, 0x010040, 0x0017FD, 0x018042,
+       0x08000A, 0x000904, 0x212286, 0x000007,
+       0x00197D, 0x038042, 0x09804A, 0x10000A,
+       0x000924, 0x001664, 0x0011FD, 0x038042,
+       0x2B804A, 0x19804A, 0x00008D, 0x218944,
+       0x000007, 0x002244, 0x0AE186, 0x000007,
+       0x001A64, 0x002A24, 0x00197D, 0x080102,
+       0x100122, 0x000820, 0x039060, 0x018040,
+       0x003DFD, 0x00008D, 0x000820, 0x018040,
+       0x001375, 0x001A7D, 0x010042, 0x09804A,
+       0x10000A, 0x00021D, 0x0189E4, 0x2992E4,
+       0x309144, 0x000007, 0x00060D, 0x000A15,
+       0x000C1D, 0x001025, 0x00A9E4, 0x012BE4,
+       0x000464, 0x01B3E4, 0x0232E4, 0x000464,
+       0x000464, 0x000464, 0x000464, 0x00040D,
+       0x08B1C4, 0x000007, 0x000820, 0x000BF5,
+       0x030040, 0x00197D, 0x038042, 0x09804A,
+       0x000A24, 0x08000A, 0x080E64, 0x000007,
+       0x100122, 0x000820, 0x031060, 0x010040,
+       0x0064AC, 0x00027D, 0x000020, 0x018040,
+       0x00107D, 0x018042, 0x0011FD, 0x3B804A,
+       0x09804A, 0x20000A, 0x000095, 0x1A1144,
+       0x00A144, 0x0D2086, 0x00040D, 0x00B984,
+       0x0D2186, 0x0018FD, 0x018042, 0x0010FD,
+       0x09804A, 0x28000A, 0x000095, 0x010924,
+       0x002A64, 0x0D1186, 0x000007, 0x002904,
+       0x0D2286, 0x000007, 0x0D2A06, 0x080002,
+       0x00008D, 0x00387D, 0x000820, 0x018040,
+       0x00127D, 0x018042, 0x10000A, 0x003904,
+       0x0DD186, 0x00080D, 0x7FFFB5, 0x00B984,
+       0x0DA186, 0x000025, 0x0E7A06, 0x00002D,
+       0x000015, 0x00082D, 0x02C78D, 0x000820,
+       0x0EC206, 0x00000D, 0x7F8035, 0x00B984,
+       0x0E7186, 0x400025, 0x00008D, 0x110944,
+       0x000007, 0x00018D, 0x109504, 0x000007,
+       0x009164, 0x000424, 0x000424, 0x000424,
+       0x100102, 0x280002, 0x02C68D, 0x000820,
+       0x0EC206, 0x00018D, 0x00042D, 0x00008D,
+       0x109504, 0x000007, 0x00020D, 0x109184,
+       0x000007, 0x02C70D, 0x000820, 0x00008D,
+       0x0038FD, 0x018040, 0x003BFD, 0x001020,
+       0x03A860, 0x000815, 0x313184, 0x212184,
+       0x000007, 0x03B060, 0x03A060, 0x018040,
+       0x0022FD, 0x000095, 0x010924, 0x000424,
+       0x000424, 0x001264, 0x100102, 0x000820,
+       0x039060, 0x018040, 0x001924, 0x00FB8D,
+       0x00397D, 0x000820, 0x058040, 0x038042,
+       0x09844A, 0x000606, 0x08040A, 0x000424,
+       0x000424, 0x00117D, 0x018042, 0x08000A,
+       0x000A24, 0x280502, 0x280C02, 0x09800D,
+       0x000820, 0x0002FD, 0x018040, 0x200007,
+       0x0022FD, 0x018042, 0x08000A, 0x000095,
+       0x280DC4, 0x011924, 0x00197D, 0x018042,
+       0x0011FD, 0x09804A, 0x10000A, 0x0000B5,
+       0x113144, 0x0A8D04, 0x000007, 0x080A44,
+       0x129504, 0x000007, 0x0023FD, 0x001020,
+       0x038040, 0x101244, 0x000007, 0x000820,
+       0x039060, 0x018040, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x10FA86, 0x000007,
+       0x003BFD, 0x000100, 0x000A10, 0x0B807A,
+       0x13804A, 0x090984, 0x000007, 0x000095,
+       0x013D04, 0x118086, 0x10000A, 0x100002,
+       0x090984, 0x000007, 0x038042, 0x11804A,
+       0x090D04, 0x000007, 0x10000A, 0x090D84,
+       0x000007, 0x00257D, 0x000820, 0x018040,
+       0x00010D, 0x000810, 0x28143A, 0x00127D,
+       0x018042, 0x20000A, 0x00197D, 0x018042,
+       0x00117D, 0x31804A, 0x10000A, 0x003124,
+       0x01280D, 0x00397D, 0x000820, 0x058040,
+       0x038042, 0x09844A, 0x000606, 0x08040A,
+       0x300102, 0x003124, 0x000424, 0x000424,
+       0x001224, 0x280502, 0x001A4C, 0x130186,
+       0x700002, 0x00002D, 0x030000, 0x00387D,
+       0x018042, 0x10000A, 0x132A06, 0x002124,
+       0x0000AD, 0x100002, 0x00010D, 0x000924,
+       0x006B24, 0x01368D, 0x00397D, 0x000820,
+       0x058040, 0x038042, 0x09844A, 0x000606,
+       0x08040A, 0x003264, 0x00008D, 0x000A24,
+       0x001020, 0x00227D, 0x018040, 0x013C0D,
+       0x000810, 0x08043A, 0x29D206, 0x000007,
+       0x002820, 0x00207D, 0x018040, 0x00117D,
+       0x038042, 0x13804A, 0x33800A, 0x00387D,
+       0x018042, 0x08000A, 0x000904, 0x163A86,
+       0x000007, 0x00008D, 0x030964, 0x01478D,
+       0x00397D, 0x000820, 0x058040, 0x038042,
+       0x09844A, 0x000606, 0x08040A, 0x380102,
+       0x000424, 0x000424, 0x001224, 0x0002FD,
+       0x018042, 0x08000A, 0x000904, 0x14A286,
+       0x000007, 0x280502, 0x001A4C, 0x163986,
+       0x000007, 0x032164, 0x00632C, 0x003DFD,
+       0x018042, 0x08000A, 0x000095, 0x090904,
+       0x000007, 0x000820, 0x001A4C, 0x156186,
+       0x018040, 0x030000, 0x157A06, 0x002124,
+       0x00010D, 0x000924, 0x006B24, 0x015B8D,
+       0x00397D, 0x000820, 0x058040, 0x038042,
+       0x09844A, 0x000606, 0x08040A, 0x003A64,
+       0x000095, 0x001224, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x15DA86, 0x000007,
+       0x01628D, 0x000810, 0x08043A, 0x29D206,
+       0x000007, 0x14D206, 0x000007, 0x007020,
+       0x08010A, 0x10012A, 0x0020FD, 0x038860,
+       0x039060, 0x018040, 0x00227D, 0x018042,
+       0x003DFD, 0x08000A, 0x31844A, 0x000904,
+       0x16D886, 0x18008B, 0x00008D, 0x189904,
+       0x00312C, 0x17AA06, 0x000007, 0x00324C,
+       0x173386, 0x000007, 0x001904, 0x173086,
+       0x000007, 0x000095, 0x199144, 0x00222C,
+       0x003124, 0x00636C, 0x000E3D, 0x001375,
+       0x000BFD, 0x010042, 0x09804A, 0x10000A,
+       0x038AEC, 0x0393EC, 0x00224C, 0x17A986,
+       0x000007, 0x00008D, 0x189904, 0x00226C,
+       0x00322C, 0x30050A, 0x301DAB, 0x002083,
+       0x0018FD, 0x018042, 0x08000A, 0x018924,
+       0x300502, 0x001083, 0x001875, 0x010042,
+       0x10000A, 0x00008D, 0x010924, 0x001375,
+       0x330542, 0x330CCB, 0x332CCB, 0x3334CB,
+       0x333CCB, 0x3344CB, 0x334CCB, 0x3354CB,
+       0x305C8B, 0x006083, 0x0002F5, 0x010042,
+       0x08000A, 0x000904, 0x187A86, 0x000007,
+       0x001E2D, 0x0005FD, 0x018042, 0x08000A,
+       0x028924, 0x280502, 0x00060D, 0x000810,
+       0x280C3A, 0x00008D, 0x000810, 0x28143A,
+       0x0A808D, 0x000820, 0x0002F5, 0x010040,
+       0x220007, 0x001275, 0x030042, 0x21004A,
+       0x00008D, 0x1A0944, 0x000007, 0x01980D,
+       0x000810, 0x08043A, 0x2B2206, 0x000007,
+       0x0001F5, 0x030042, 0x0D004A, 0x10000A,
+       0x089144, 0x000007, 0x000820, 0x010040,
+       0x0025F5, 0x0A3144, 0x000007, 0x000820,
+       0x032860, 0x030040, 0x00217D, 0x038042,
+       0x0B804A, 0x10000A, 0x000820, 0x031060,
+       0x030040, 0x00008D, 0x000124, 0x00012C,
+       0x000E64, 0x001A64, 0x00636C, 0x08010A,
+       0x10012A, 0x000820, 0x031060, 0x030040,
+       0x0020FD, 0x018042, 0x08000A, 0x00227D,
+       0x018042, 0x10000A, 0x000820, 0x031060,
+       0x030040, 0x00197D, 0x018042, 0x08000A,
+       0x0022FD, 0x038042, 0x10000A, 0x000820,
+       0x031060, 0x030040, 0x090D04, 0x000007,
+       0x000820, 0x030040, 0x038042, 0x0B804A,
+       0x10000A, 0x000820, 0x031060, 0x030040,
+       0x038042, 0x13804A, 0x19804A, 0x110D04,
+       0x198D04, 0x000007, 0x08000A, 0x001020,
+       0x031860, 0x030860, 0x030040, 0x00008D,
+       0x0B0944, 0x000007, 0x000820, 0x010040,
+       0x0005F5, 0x030042, 0x08000A, 0x000820,
+       0x010040, 0x0000F5, 0x010042, 0x08000A,
+       0x000904, 0x1C6086, 0x001E75, 0x030042,
+       0x01044A, 0x000C0A, 0x1C7206, 0x000007,
+       0x000402, 0x000C02, 0x00177D, 0x001AF5,
+       0x018042, 0x03144A, 0x031C4A, 0x03244A,
+       0x032C4A, 0x03344A, 0x033C4A, 0x03444A,
+       0x004C0A, 0x00043D, 0x0013F5, 0x001AFD,
+       0x030042, 0x0B004A, 0x1B804A, 0x13804A,
+       0x20000A, 0x089144, 0x19A144, 0x0389E4,
+       0x0399EC, 0x005502, 0x005D0A, 0x030042,
+       0x0B004A, 0x1B804A, 0x13804A, 0x20000A,
+       0x089144, 0x19A144, 0x0389E4, 0x0399EC,
+       0x006502, 0x006D0A, 0x030042, 0x0B004A,
+       0x19004A, 0x2B804A, 0x13804A, 0x21804A,
+       0x30000A, 0x089144, 0x19A144, 0x2AB144,
+       0x0389E4, 0x0399EC, 0x007502, 0x007D0A,
+       0x03A9E4, 0x000702, 0x00107D, 0x000415,
+       0x018042, 0x08000A, 0x0109E4, 0x000F02,
+       0x002AF5, 0x0019FD, 0x010042, 0x09804A,
+       0x10000A, 0x000934, 0x001674, 0x0029F5,
+       0x010042, 0x10000A, 0x00917C, 0x002075,
+       0x010042, 0x08000A, 0x000904, 0x1ED286,
+       0x0026F5, 0x0027F5, 0x030042, 0x09004A,
+       0x10000A, 0x000A3C, 0x00167C, 0x001A75,
+       0x000BFD, 0x010042, 0x51804A, 0x48000A,
+       0x160007, 0x001075, 0x010042, 0x282C0A,
+       0x281D12, 0x282512, 0x001F32, 0x1E0007,
+       0x0E0007, 0x001975, 0x010042, 0x002DF5,
+       0x0D004A, 0x10000A, 0x009144, 0x1FB286,
+       0x010042, 0x28340A, 0x000E5D, 0x00008D,
+       0x000375, 0x000820, 0x010040, 0x05D2F4,
+       0x54D104, 0x00735C, 0x205386, 0x000007,
+       0x0C0007, 0x080007, 0x0A0007, 0x02040D,
+       0x000810, 0x08043A, 0x332206, 0x000007,
+       0x205A06, 0x000007, 0x080007, 0x002275,
+       0x010042, 0x20000A, 0x002104, 0x212086,
+       0x001E2D, 0x0002F5, 0x010042, 0x08000A,
+       0x000904, 0x209286, 0x000007, 0x002010,
+       0x30043A, 0x00057D, 0x0180C3, 0x08000A,
+       0x028924, 0x280502, 0x280C02, 0x0A810D,
+       0x000820, 0x0002F5, 0x010040, 0x220007,
+       0x0004FD, 0x018042, 0x70000A, 0x030000,
+       0x007020, 0x06FA06, 0x018040, 0x02180D,
+       0x000810, 0x08043A, 0x2B2206, 0x000007,
+       0x0002FD, 0x018042, 0x08000A, 0x000904,
+       0x218A86, 0x000007, 0x01F206, 0x000007,
+       0x000875, 0x0009FD, 0x00010D, 0x220A06,
+       0x000295, 0x000B75, 0x00097D, 0x00000D,
+       0x000515, 0x010042, 0x18000A, 0x001904,
+       0x287886, 0x0006F5, 0x001020, 0x010040,
+       0x0004F5, 0x000820, 0x010040, 0x000775,
+       0x010042, 0x09804A, 0x10000A, 0x001124,
+       0x000904, 0x22BA86, 0x000815, 0x080102,
+       0x101204, 0x22DA06, 0x000575, 0x081204,
+       0x000007, 0x100102, 0x000575, 0x000425,
+       0x021124, 0x100102, 0x000820, 0x031060,
+       0x010040, 0x001924, 0x287886, 0x00008D,
+       0x000464, 0x009D04, 0x278886, 0x180102,
+       0x000575, 0x010042, 0x28040A, 0x00018D,
+       0x000924, 0x280D02, 0x00000D, 0x000924,
+       0x281502, 0x10000D, 0x000820, 0x0002F5,
+       0x010040, 0x200007, 0x001175, 0x0002FD,
+       0x018042, 0x08000A, 0x000904, 0x23C286,
+       0x000007, 0x000100, 0x080B20, 0x130B60,
+       0x1B0B60, 0x030A60, 0x010040, 0x050042,
+       0x3D004A, 0x35004A, 0x2D004A, 0x20000A,
+       0x0006F5, 0x010042, 0x28140A, 0x0004F5,
+       0x010042, 0x08000A, 0x000315, 0x010D04,
+       0x24CA86, 0x004015, 0x000095, 0x010D04,
+       0x24B886, 0x100022, 0x10002A, 0x24E206,
+       0x000007, 0x333104, 0x2AA904, 0x000007,
+       0x032124, 0x280502, 0x001124, 0x000424,
+       0x000424, 0x003224, 0x00292C, 0x00636C,
+       0x25F386, 0x000007, 0x02B164, 0x000464,
+       0x000464, 0x00008D, 0x000A64, 0x280D02,
+       0x10008D, 0x000820, 0x0002F5, 0x010040,
+       0x220007, 0x00008D, 0x38B904, 0x000007,
+       0x03296C, 0x30010A, 0x0002F5, 0x010042,
+       0x08000A, 0x000904, 0x25BA86, 0x000007,
+       0x02312C, 0x28050A, 0x00008D, 0x01096C,
+       0x280D0A, 0x10010D, 0x000820, 0x0002F5,
+       0x010040, 0x220007, 0x001124, 0x000424,
+       0x000424, 0x003224, 0x300102, 0x032944,
+       0x267A86, 0x000007, 0x300002, 0x0004F5,
+       0x010042, 0x08000A, 0x000315, 0x010D04,
+       0x26C086, 0x003124, 0x000464, 0x300102,
+       0x0002F5, 0x010042, 0x08000A, 0x000904,
+       0x26CA86, 0x000007, 0x003124, 0x300502,
+       0x003924, 0x300583, 0x000883, 0x0005F5,
+       0x010042, 0x28040A, 0x00008D, 0x008124,
+       0x280D02, 0x00008D, 0x008124, 0x281502,
+       0x10018D, 0x000820, 0x0002F5, 0x010040,
+       0x220007, 0x001025, 0x000575, 0x030042,
+       0x09004A, 0x10000A, 0x0A0904, 0x121104,
+       0x000007, 0x001020, 0x050860, 0x050040,
+       0x0006FD, 0x018042, 0x09004A, 0x10000A,
+       0x0000A5, 0x0A0904, 0x121104, 0x000007,
+       0x000820, 0x019060, 0x010040, 0x0002F5,
+       0x010042, 0x08000A, 0x000904, 0x284286,
+       0x000007, 0x230A06, 0x000007, 0x000606,
+       0x000007, 0x0002F5, 0x010042, 0x08000A,
+       0x000904, 0x289286, 0x000007, 0x000100,
+       0x080B20, 0x138B60, 0x1B8B60, 0x238B60,
+       0x2B8B60, 0x338B60, 0x3B8B60, 0x438B60,
+       0x4B8B60, 0x538B60, 0x5B8B60, 0x638B60,
+       0x6B8B60, 0x738B60, 0x7B8B60, 0x038F60,
+       0x0B8F60, 0x138F60, 0x1B8F60, 0x238F60,
+       0x2B8F60, 0x338F60, 0x3B8F60, 0x438F60,
+       0x4B8F60, 0x538F60, 0x5B8F60, 0x638F60,
+       0x6B8F60, 0x738F60, 0x7B8F60, 0x038A60,
+       0x000606, 0x018040, 0x00008D, 0x000A64,
+       0x280D02, 0x000A24, 0x00027D, 0x018042,
+       0x10000A, 0x001224, 0x0003FD, 0x018042,
+       0x08000A, 0x000904, 0x2A8286, 0x000007,
+       0x00018D, 0x000A24, 0x000464, 0x000464,
+       0x080102, 0x000924, 0x000424, 0x000424,
+       0x100102, 0x02000D, 0x009144, 0x2AD986,
+       0x000007, 0x0001FD, 0x018042, 0x08000A,
+       0x000A44, 0x2ABB86, 0x018042, 0x0A000D,
+       0x000820, 0x0002FD, 0x018040, 0x200007,
+       0x00027D, 0x001020, 0x000606, 0x018040,
+       0x0002F5, 0x010042, 0x08000A, 0x000904,
+       0x2B2A86, 0x000007, 0x00037D, 0x018042,
+       0x08000A, 0x000904, 0x2B5A86, 0x000007,
+       0x000075, 0x002E7D, 0x010042, 0x0B804A,
+       0x000020, 0x000904, 0x000686, 0x010040,
+       0x31844A, 0x30048B, 0x000883, 0x00008D,
+       0x000810, 0x28143A, 0x00008D, 0x000810,
+       0x280C3A, 0x000675, 0x010042, 0x08000A,
+       0x003815, 0x010924, 0x280502, 0x0B000D,
+       0x000820, 0x0002F5, 0x010040, 0x000606,
+       0x220007, 0x000464, 0x000464, 0x000606,
+       0x000007, 0x000134, 0x007F8D, 0x00093C,
+       0x281D12, 0x282512, 0x001F32, 0x0E0007,
+       0x00010D, 0x00037D, 0x000820, 0x018040,
+       0x05D2F4, 0x000007, 0x080007, 0x00037D,
+       0x018042, 0x08000A, 0x000904, 0x2D0286,
+       0x000007, 0x000606, 0x000007, 0x000007,
+       0x000012, 0x100007, 0x320007, 0x600007,
+       0x100080, 0x48001A, 0x004904, 0x2D6186,
+       0x000007, 0x001210, 0x58003A, 0x000145,
+       0x5C5D04, 0x000007, 0x000080, 0x48001A,
+       0x004904, 0x2DB186, 0x000007, 0x001210,
+       0x50003A, 0x005904, 0x2E0886, 0x000045,
+       0x0000C5, 0x7FFFF5, 0x7FFF7D, 0x07D524,
+       0x004224, 0x500102, 0x200502, 0x000082,
+       0x40001A, 0x004104, 0x2E3986, 0x000007,
+       0x003865, 0x40001A, 0x004020, 0x00104D,
+       0x04C184, 0x301B86, 0x000040, 0x040007,
+       0x000165, 0x000145, 0x004020, 0x000040,
+       0x000765, 0x080080, 0x40001A, 0x004104,
+       0x2EC986, 0x000007, 0x001210, 0x40003A,
+       0x004104, 0x2F2286, 0x00004D, 0x0000CD,
+       0x004810, 0x20043A, 0x000882, 0x40001A,
+       0x004104, 0x2F3186, 0x000007, 0x004820,
+       0x005904, 0x300886, 0x000040, 0x0007E5,
+       0x200480, 0x2816A0, 0x3216E0, 0x3A16E0,
+       0x4216E0, 0x021260, 0x000040, 0x000032,
+       0x400075, 0x00007D, 0x07D574, 0x200512,
+       0x000082, 0x40001A, 0x004104, 0x2FE186,
+       0x000007, 0x037206, 0x640007, 0x060007,
+       0x0000E5, 0x000020, 0x000040, 0x000A65,
+       0x000020, 0x020040, 0x020040, 0x000040,
+       0x000165, 0x000042, 0x70000A, 0x007104,
+       0x30A286, 0x000007, 0x018206, 0x640007,
+       0x050000, 0x007020, 0x000040, 0x037206,
+       0x640007, 0x000007, 0x00306D, 0x028860,
+       0x029060, 0x08000A, 0x028860, 0x008040,
+       0x100012, 0x00100D, 0x009184, 0x314186,
+       0x000E0D, 0x009184, 0x325186, 0x000007,
+       0x300007, 0x001020, 0x003B6D, 0x008040,
+       0x000080, 0x08001A, 0x000904, 0x316186,
+       0x000007, 0x001220, 0x000DED, 0x008040,
+       0x008042, 0x10000A, 0x40000D, 0x109544,
+       0x000007, 0x001020, 0x000DED, 0x008040,
+       0x008042, 0x20040A, 0x000082, 0x08001A,
+       0x000904, 0x31F186, 0x000007, 0x003B6D,
+       0x008042, 0x08000A, 0x000E15, 0x010984,
+       0x329B86, 0x600007, 0x08001A, 0x000C15,
+       0x010984, 0x328386, 0x000020, 0x1A0007,
+       0x0002ED, 0x008040, 0x620007, 0x00306D,
+       0x028042, 0x0A804A, 0x000820, 0x0A804A,
+       0x000606, 0x10804A, 0x000007, 0x282512,
+       0x001F32, 0x05D2F4, 0x54D104, 0x00735C,
+       0x000786, 0x000007, 0x0C0007, 0x0A0007,
+       0x1C0007, 0x003465, 0x020040, 0x004820,
+       0x025060, 0x40000A, 0x024060, 0x000040,
+       0x454944, 0x000007, 0x004020, 0x003AE5,
+       0x000040, 0x0028E5, 0x000042, 0x48000A,
+       0x004904, 0x386886, 0x002C65, 0x000042,
+       0x40000A, 0x0000D5, 0x454104, 0x000007,
+       0x000655, 0x054504, 0x34F286, 0x0001D5,
+       0x054504, 0x34F086, 0x002B65, 0x000042,
+       0x003AE5, 0x50004A, 0x40000A, 0x45C3D4,
+       0x000007, 0x454504, 0x000007, 0x0000CD,
+       0x444944, 0x000007, 0x454504, 0x000007,
+       0x00014D, 0x554944, 0x000007, 0x045144,
+       0x34E986, 0x002C65, 0x000042, 0x48000A,
+       0x4CD104, 0x000007, 0x04C144, 0x34F386,
+       0x000007, 0x160007, 0x002CE5, 0x040042,
+       0x40000A, 0x004020, 0x000040, 0x002965,
+       0x000042, 0x40000A, 0x004104, 0x356086,
+       0x000007, 0x002402, 0x36A206, 0x005C02,
+       0x0025E5, 0x000042, 0x40000A, 0x004274,
+       0x002AE5, 0x000042, 0x40000A, 0x004274,
+       0x500112, 0x0029E5, 0x000042, 0x40000A,
+       0x004234, 0x454104, 0x000007, 0x004020,
+       0x000040, 0x003EE5, 0x000020, 0x000040,
+       0x002DE5, 0x400152, 0x50000A, 0x045144,
+       0x364A86, 0x0000C5, 0x003EE5, 0x004020,
+       0x000040, 0x002BE5, 0x000042, 0x40000A,
+       0x404254, 0x000007, 0x002AE5, 0x004020,
+       0x000040, 0x500132, 0x040134, 0x005674,
+       0x0029E5, 0x020042, 0x42000A, 0x000042,
+       0x50000A, 0x05417C, 0x0028E5, 0x000042,
+       0x48000A, 0x0000C5, 0x4CC144, 0x371086,
+       0x0026E5, 0x0027E5, 0x020042, 0x40004A,
+       0x50000A, 0x00423C, 0x00567C, 0x0028E5,
+       0x004820, 0x000040, 0x281D12, 0x282512,
+       0x001F72, 0x002965, 0x000042, 0x40000A,
+       0x004104, 0x37AA86, 0x0E0007, 0x160007,
+       0x1E0007, 0x003EE5, 0x000042, 0x40000A,
+       0x004104, 0x37E886, 0x002D65, 0x000042,
+       0x28340A, 0x003465, 0x020042, 0x42004A,
+       0x004020, 0x4A004A, 0x50004A, 0x05D2F4,
+       0x54D104, 0x00735C, 0x385186, 0x000007,
+       0x000606, 0x080007, 0x0C0007, 0x080007,
+       0x0A0007, 0x0001E5, 0x020045, 0x004020,
+       0x000060, 0x000365, 0x000040, 0x002E65,
+       0x001A20, 0x0A1A60, 0x000040, 0x003465,
+       0x020042, 0x42004A, 0x004020, 0x4A004A,
+       0x000606, 0x50004A, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000
+};
+
+// --------------------------------------------
+//  DS-1E Controller InstructionRAM Code
+//     1999/06/21
+//     Buf441 slot is Enabled.
+// --------------------------------------------
+// 04/09  creat
+// 04/12  stop nise fix
+// 06/21  WorkingOff timming
+static unsigned long int       CntrlInst1E[] = {
+       0x000007, 0x240007, 0x0C0007, 0x1C0007,
+       0x060007, 0x700002, 0x000020, 0x030040,
+       0x007104, 0x004286, 0x030040, 0x000F0D,
+       0x000810, 0x20043A, 0x000282, 0x00020D,
+       0x000810, 0x20043A, 0x001282, 0x200E82,
+       0x00800D, 0x000810, 0x20043A, 0x001A82,
+       0x03460D, 0x000810, 0x10043A, 0x02EC0D,
+       0x000810, 0x18043A, 0x00010D, 0x020015,
+       0x0000FD, 0x000020, 0x038860, 0x039060,
+       0x038060, 0x038040, 0x038040, 0x038040,
+       0x018040, 0x000A7D, 0x038040, 0x038040,
+       0x018040, 0x200402, 0x000882, 0x08001A,
+       0x000904, 0x017186, 0x000007, 0x260007,
+       0x400007, 0x000007, 0x03258D, 0x000810,
+       0x18043A, 0x260007, 0x284402, 0x00087D,
+       0x018042, 0x00160A, 0x05A206, 0x000007,
+       0x440007, 0x00230D, 0x000810, 0x08043A,
+       0x22FA06, 0x000007, 0x0007FD, 0x018042,
+       0x08000A, 0x000904, 0x02AB86, 0x000195,
+       0x090D04, 0x000007, 0x000820, 0x0000F5,
+       0x000B7D, 0x01F060, 0x0000FD, 0x033A06,
+       0x018040, 0x000A7D, 0x038042, 0x13804A,
+       0x18000A, 0x001820, 0x059060, 0x058860,
+       0x018040, 0x0000FD, 0x018042, 0x70000A,
+       0x000115, 0x071144, 0x033B86, 0x030000,
+       0x007020, 0x036206, 0x018040, 0x00360D,
+       0x000810, 0x08043A, 0x232206, 0x000007,
+       0x02EC0D, 0x000810, 0x18043A, 0x019A06,
+       0x000007, 0x240007, 0x000F8D, 0x000810,
+       0x00163A, 0x002402, 0x005C02, 0x0028FD,
+       0x000020, 0x018040, 0x08000D, 0x000815,
+       0x510984, 0x000007, 0x00004D, 0x000E5D,
+       0x000E02, 0x00430D, 0x000810, 0x08043A,
+       0x2E1206, 0x000007, 0x00008D, 0x000924,
+       0x000F02, 0x00470D, 0x000810, 0x08043A,
+       0x2E1206, 0x000007, 0x480480, 0x001210,
+       0x28043A, 0x00778D, 0x000810, 0x280C3A,
+       0x00068D, 0x000810, 0x28143A, 0x284402,
+       0x03258D, 0x000810, 0x18043A, 0x07FF8D,
+       0x000820, 0x0002FD, 0x018040, 0x260007,
+       0x200007, 0x0002FD, 0x018042, 0x08000A,
+       0x000904, 0x051286, 0x000007, 0x240007,
+       0x02EC0D, 0x000810, 0x18043A, 0x00387D,
+       0x018042, 0x08000A, 0x001015, 0x010984,
+       0x019B86, 0x000007, 0x01B206, 0x000007,
+       0x0008FD, 0x018042, 0x18000A, 0x001904,
+       0x22B886, 0x280007, 0x001810, 0x28043A,
+       0x280C02, 0x00000D, 0x000810, 0x28143A,
+       0x08808D, 0x000820, 0x0002FD, 0x018040,
+       0x200007, 0x00020D, 0x189904, 0x000007,
+       0x00402D, 0x0000BD, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x065A86, 0x000007,
+       0x000100, 0x000A20, 0x00047D, 0x018040,
+       0x018042, 0x20000A, 0x003015, 0x012144,
+       0x036186, 0x000007, 0x002104, 0x036186,
+       0x000007, 0x000F8D, 0x000810, 0x280C3A,
+       0x023944, 0x07C986, 0x000007, 0x001810,
+       0x28043A, 0x08810D, 0x000820, 0x0002FD,
+       0x018040, 0x200007, 0x002810, 0x78003A,
+       0x00788D, 0x000810, 0x08043A, 0x2A1206,
+       0x000007, 0x00400D, 0x001015, 0x189904,
+       0x292904, 0x393904, 0x000007, 0x070206,
+       0x000007, 0x0004F5, 0x00007D, 0x000020,
+       0x00008D, 0x010860, 0x018040, 0x00047D,
+       0x038042, 0x21804A, 0x18000A, 0x021944,
+       0x229086, 0x000007, 0x004075, 0x71F104,
+       0x000007, 0x010042, 0x28000A, 0x002904,
+       0x225886, 0x000007, 0x003C0D, 0x30A904,
+       0x000007, 0x00077D, 0x018042, 0x08000A,
+       0x000904, 0x08DA86, 0x00057D, 0x002820,
+       0x03B060, 0x08F206, 0x018040, 0x003020,
+       0x03A860, 0x018040, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x08FA86, 0x000007,
+       0x00057D, 0x018042, 0x28040A, 0x000E8D,
+       0x000810, 0x280C3A, 0x00000D, 0x000810,
+       0x28143A, 0x09000D, 0x000820, 0x0002FD,
+       0x018040, 0x200007, 0x003DFD, 0x000020,
+       0x018040, 0x00107D, 0x009D8D, 0x000810,
+       0x08043A, 0x2A1206, 0x000007, 0x000815,
+       0x08001A, 0x010984, 0x0A5186, 0x00137D,
+       0x200500, 0x280F20, 0x338F60, 0x3B8F60,
+       0x438F60, 0x4B8F60, 0x538F60, 0x5B8F60,
+       0x038A60, 0x018040, 0x00107D, 0x018042,
+       0x08000A, 0x000215, 0x010984, 0x3A8186,
+       0x000007, 0x007FBD, 0x383DC4, 0x000007,
+       0x001A7D, 0x001375, 0x018042, 0x09004A,
+       0x10000A, 0x0B8D04, 0x139504, 0x000007,
+       0x000820, 0x019060, 0x001104, 0x225886,
+       0x010040, 0x0017FD, 0x018042, 0x08000A,
+       0x000904, 0x225A86, 0x000007, 0x00197D,
+       0x038042, 0x09804A, 0x10000A, 0x000924,
+       0x001664, 0x0011FD, 0x038042, 0x2B804A,
+       0x19804A, 0x00008D, 0x218944, 0x000007,
+       0x002244, 0x0C1986, 0x000007, 0x001A64,
+       0x002A24, 0x00197D, 0x080102, 0x100122,
+       0x000820, 0x039060, 0x018040, 0x003DFD,
+       0x00008D, 0x000820, 0x018040, 0x001375,
+       0x001A7D, 0x010042, 0x09804A, 0x10000A,
+       0x00021D, 0x0189E4, 0x2992E4, 0x309144,
+       0x000007, 0x00060D, 0x000A15, 0x000C1D,
+       0x001025, 0x00A9E4, 0x012BE4, 0x000464,
+       0x01B3E4, 0x0232E4, 0x000464, 0x000464,
+       0x000464, 0x000464, 0x00040D, 0x08B1C4,
+       0x000007, 0x000820, 0x000BF5, 0x030040,
+       0x00197D, 0x038042, 0x09804A, 0x000A24,
+       0x08000A, 0x080E64, 0x000007, 0x100122,
+       0x000820, 0x031060, 0x010040, 0x0064AC,
+       0x00027D, 0x000020, 0x018040, 0x00107D,
+       0x018042, 0x0011FD, 0x3B804A, 0x09804A,
+       0x20000A, 0x000095, 0x1A1144, 0x00A144,
+       0x0E5886, 0x00040D, 0x00B984, 0x0E5986,
+       0x0018FD, 0x018042, 0x0010FD, 0x09804A,
+       0x28000A, 0x000095, 0x010924, 0x002A64,
+       0x0E4986, 0x000007, 0x002904, 0x0E5A86,
+       0x000007, 0x0E6206, 0x080002, 0x00008D,
+       0x00387D, 0x000820, 0x018040, 0x00127D,
+       0x018042, 0x10000A, 0x003904, 0x0F0986,
+       0x00080D, 0x7FFFB5, 0x00B984, 0x0ED986,
+       0x000025, 0x0FB206, 0x00002D, 0x000015,
+       0x00082D, 0x02E00D, 0x000820, 0x0FFA06,
+       0x00000D, 0x7F8035, 0x00B984, 0x0FA986,
+       0x400025, 0x00008D, 0x110944, 0x000007,
+       0x00018D, 0x109504, 0x000007, 0x009164,
+       0x000424, 0x000424, 0x000424, 0x100102,
+       0x280002, 0x02DF0D, 0x000820, 0x0FFA06,
+       0x00018D, 0x00042D, 0x00008D, 0x109504,
+       0x000007, 0x00020D, 0x109184, 0x000007,
+       0x02DF8D, 0x000820, 0x00008D, 0x0038FD,
+       0x018040, 0x003BFD, 0x001020, 0x03A860,
+       0x000815, 0x313184, 0x212184, 0x000007,
+       0x03B060, 0x03A060, 0x018040, 0x0022FD,
+       0x000095, 0x010924, 0x000424, 0x000424,
+       0x001264, 0x100102, 0x000820, 0x039060,
+       0x018040, 0x001924, 0x010F0D, 0x00397D,
+       0x000820, 0x058040, 0x038042, 0x09844A,
+       0x000606, 0x08040A, 0x000424, 0x000424,
+       0x00117D, 0x018042, 0x08000A, 0x000A24,
+       0x280502, 0x280C02, 0x09800D, 0x000820,
+       0x0002FD, 0x018040, 0x200007, 0x0022FD,
+       0x018042, 0x08000A, 0x000095, 0x280DC4,
+       0x011924, 0x00197D, 0x018042, 0x0011FD,
+       0x09804A, 0x10000A, 0x0000B5, 0x113144,
+       0x0A8D04, 0x000007, 0x080A44, 0x129504,
+       0x000007, 0x0023FD, 0x001020, 0x038040,
+       0x101244, 0x000007, 0x000820, 0x039060,
+       0x018040, 0x0002FD, 0x018042, 0x08000A,
+       0x000904, 0x123286, 0x000007, 0x003BFD,
+       0x000100, 0x000A10, 0x0B807A, 0x13804A,
+       0x090984, 0x000007, 0x000095, 0x013D04,
+       0x12B886, 0x10000A, 0x100002, 0x090984,
+       0x000007, 0x038042, 0x11804A, 0x090D04,
+       0x000007, 0x10000A, 0x090D84, 0x000007,
+       0x00257D, 0x000820, 0x018040, 0x00010D,
+       0x000810, 0x28143A, 0x00127D, 0x018042,
+       0x20000A, 0x00197D, 0x018042, 0x00117D,
+       0x31804A, 0x10000A, 0x003124, 0x013B8D,
+       0x00397D, 0x000820, 0x058040, 0x038042,
+       0x09844A, 0x000606, 0x08040A, 0x300102,
+       0x003124, 0x000424, 0x000424, 0x001224,
+       0x280502, 0x001A4C, 0x143986, 0x700002,
+       0x00002D, 0x030000, 0x00387D, 0x018042,
+       0x10000A, 0x146206, 0x002124, 0x0000AD,
+       0x100002, 0x00010D, 0x000924, 0x006B24,
+       0x014A0D, 0x00397D, 0x000820, 0x058040,
+       0x038042, 0x09844A, 0x000606, 0x08040A,
+       0x003264, 0x00008D, 0x000A24, 0x001020,
+       0x00227D, 0x018040, 0x014F8D, 0x000810,
+       0x08043A, 0x2B5A06, 0x000007, 0x002820,
+       0x00207D, 0x018040, 0x00117D, 0x038042,
+       0x13804A, 0x33800A, 0x00387D, 0x018042,
+       0x08000A, 0x000904, 0x177286, 0x000007,
+       0x00008D, 0x030964, 0x015B0D, 0x00397D,
+       0x000820, 0x058040, 0x038042, 0x09844A,
+       0x000606, 0x08040A, 0x380102, 0x000424,
+       0x000424, 0x001224, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x15DA86, 0x000007,
+       0x280502, 0x001A4C, 0x177186, 0x000007,
+       0x032164, 0x00632C, 0x003DFD, 0x018042,
+       0x08000A, 0x000095, 0x090904, 0x000007,
+       0x000820, 0x001A4C, 0x169986, 0x018040,
+       0x030000, 0x16B206, 0x002124, 0x00010D,
+       0x000924, 0x006B24, 0x016F0D, 0x00397D,
+       0x000820, 0x058040, 0x038042, 0x09844A,
+       0x000606, 0x08040A, 0x003A64, 0x000095,
+       0x001224, 0x0002FD, 0x018042, 0x08000A,
+       0x000904, 0x171286, 0x000007, 0x01760D,
+       0x000810, 0x08043A, 0x2B5A06, 0x000007,
+       0x160A06, 0x000007, 0x007020, 0x08010A,
+       0x10012A, 0x0020FD, 0x038860, 0x039060,
+       0x018040, 0x00227D, 0x018042, 0x003DFD,
+       0x08000A, 0x31844A, 0x000904, 0x181086,
+       0x18008B, 0x00008D, 0x189904, 0x00312C,
+       0x18E206, 0x000007, 0x00324C, 0x186B86,
+       0x000007, 0x001904, 0x186886, 0x000007,
+       0x000095, 0x199144, 0x00222C, 0x003124,
+       0x00636C, 0x000E3D, 0x001375, 0x000BFD,
+       0x010042, 0x09804A, 0x10000A, 0x038AEC,
+       0x0393EC, 0x00224C, 0x18E186, 0x000007,
+       0x00008D, 0x189904, 0x00226C, 0x00322C,
+       0x30050A, 0x301DAB, 0x002083, 0x0018FD,
+       0x018042, 0x08000A, 0x018924, 0x300502,
+       0x001083, 0x001875, 0x010042, 0x10000A,
+       0x00008D, 0x010924, 0x001375, 0x330542,
+       0x330CCB, 0x332CCB, 0x3334CB, 0x333CCB,
+       0x3344CB, 0x334CCB, 0x3354CB, 0x305C8B,
+       0x006083, 0x0002F5, 0x010042, 0x08000A,
+       0x000904, 0x19B286, 0x000007, 0x001E2D,
+       0x0005FD, 0x018042, 0x08000A, 0x028924,
+       0x280502, 0x00060D, 0x000810, 0x280C3A,
+       0x00008D, 0x000810, 0x28143A, 0x0A808D,
+       0x000820, 0x0002F5, 0x010040, 0x220007,
+       0x001275, 0x030042, 0x21004A, 0x00008D,
+       0x1A0944, 0x000007, 0x01AB8D, 0x000810,
+       0x08043A, 0x2CAA06, 0x000007, 0x0001F5,
+       0x030042, 0x0D004A, 0x10000A, 0x089144,
+       0x000007, 0x000820, 0x010040, 0x0025F5,
+       0x0A3144, 0x000007, 0x000820, 0x032860,
+       0x030040, 0x00217D, 0x038042, 0x0B804A,
+       0x10000A, 0x000820, 0x031060, 0x030040,
+       0x00008D, 0x000124, 0x00012C, 0x000E64,
+       0x001A64, 0x00636C, 0x08010A, 0x10012A,
+       0x000820, 0x031060, 0x030040, 0x0020FD,
+       0x018042, 0x08000A, 0x00227D, 0x018042,
+       0x10000A, 0x000820, 0x031060, 0x030040,
+       0x00197D, 0x018042, 0x08000A, 0x0022FD,
+       0x038042, 0x10000A, 0x000820, 0x031060,
+       0x030040, 0x090D04, 0x000007, 0x000820,
+       0x030040, 0x038042, 0x0B804A, 0x10000A,
+       0x000820, 0x031060, 0x030040, 0x038042,
+       0x13804A, 0x19804A, 0x110D04, 0x198D04,
+       0x000007, 0x08000A, 0x001020, 0x031860,
+       0x030860, 0x030040, 0x00008D, 0x0B0944,
+       0x000007, 0x000820, 0x010040, 0x0005F5,
+       0x030042, 0x08000A, 0x000820, 0x010040,
+       0x0000F5, 0x010042, 0x08000A, 0x000904,
+       0x1D9886, 0x001E75, 0x030042, 0x01044A,
+       0x000C0A, 0x1DAA06, 0x000007, 0x000402,
+       0x000C02, 0x00177D, 0x001AF5, 0x018042,
+       0x03144A, 0x031C4A, 0x03244A, 0x032C4A,
+       0x03344A, 0x033C4A, 0x03444A, 0x004C0A,
+       0x00043D, 0x0013F5, 0x001AFD, 0x030042,
+       0x0B004A, 0x1B804A, 0x13804A, 0x20000A,
+       0x089144, 0x19A144, 0x0389E4, 0x0399EC,
+       0x005502, 0x005D0A, 0x030042, 0x0B004A,
+       0x1B804A, 0x13804A, 0x20000A, 0x089144,
+       0x19A144, 0x0389E4, 0x0399EC, 0x006502,
+       0x006D0A, 0x030042, 0x0B004A, 0x19004A,
+       0x2B804A, 0x13804A, 0x21804A, 0x30000A,
+       0x089144, 0x19A144, 0x2AB144, 0x0389E4,
+       0x0399EC, 0x007502, 0x007D0A, 0x03A9E4,
+       0x000702, 0x00107D, 0x000415, 0x018042,
+       0x08000A, 0x0109E4, 0x000F02, 0x002AF5,
+       0x0019FD, 0x010042, 0x09804A, 0x10000A,
+       0x000934, 0x001674, 0x0029F5, 0x010042,
+       0x10000A, 0x00917C, 0x002075, 0x010042,
+       0x08000A, 0x000904, 0x200A86, 0x0026F5,
+       0x0027F5, 0x030042, 0x09004A, 0x10000A,
+       0x000A3C, 0x00167C, 0x001A75, 0x000BFD,
+       0x010042, 0x51804A, 0x48000A, 0x160007,
+       0x001075, 0x010042, 0x282C0A, 0x281D12,
+       0x282512, 0x001F32, 0x1E0007, 0x0E0007,
+       0x001975, 0x010042, 0x002DF5, 0x0D004A,
+       0x10000A, 0x009144, 0x20EA86, 0x010042,
+       0x28340A, 0x000E5D, 0x00008D, 0x000375,
+       0x000820, 0x010040, 0x05D2F4, 0x54D104,
+       0x00735C, 0x218B86, 0x000007, 0x0C0007,
+       0x080007, 0x0A0007, 0x02178D, 0x000810,
+       0x08043A, 0x34B206, 0x000007, 0x219206,
+       0x000007, 0x080007, 0x002275, 0x010042,
+       0x20000A, 0x002104, 0x225886, 0x001E2D,
+       0x0002F5, 0x010042, 0x08000A, 0x000904,
+       0x21CA86, 0x000007, 0x002010, 0x30043A,
+       0x00057D, 0x0180C3, 0x08000A, 0x028924,
+       0x280502, 0x280C02, 0x0A810D, 0x000820,
+       0x0002F5, 0x010040, 0x220007, 0x0004FD,
+       0x018042, 0x70000A, 0x030000, 0x007020,
+       0x07FA06, 0x018040, 0x022B8D, 0x000810,
+       0x08043A, 0x2CAA06, 0x000007, 0x0002FD,
+       0x018042, 0x08000A, 0x000904, 0x22C286,
+       0x000007, 0x020206, 0x000007, 0x000875,
+       0x0009FD, 0x00010D, 0x234206, 0x000295,
+       0x000B75, 0x00097D, 0x00000D, 0x000515,
+       0x010042, 0x18000A, 0x001904, 0x2A0086,
+       0x0006F5, 0x001020, 0x010040, 0x0004F5,
+       0x000820, 0x010040, 0x000775, 0x010042,
+       0x09804A, 0x10000A, 0x001124, 0x000904,
+       0x23F286, 0x000815, 0x080102, 0x101204,
+       0x241206, 0x000575, 0x081204, 0x000007,
+       0x100102, 0x000575, 0x000425, 0x021124,
+       0x100102, 0x000820, 0x031060, 0x010040,
+       0x001924, 0x2A0086, 0x00008D, 0x000464,
+       0x009D04, 0x291086, 0x180102, 0x000575,
+       0x010042, 0x28040A, 0x00018D, 0x000924,
+       0x280D02, 0x00000D, 0x000924, 0x281502,
+       0x10000D, 0x000820, 0x0002F5, 0x010040,
+       0x200007, 0x001175, 0x0002FD, 0x018042,
+       0x08000A, 0x000904, 0x24FA86, 0x000007,
+       0x000100, 0x080B20, 0x130B60, 0x1B0B60,
+       0x030A60, 0x010040, 0x050042, 0x3D004A,
+       0x35004A, 0x2D004A, 0x20000A, 0x0006F5,
+       0x010042, 0x28140A, 0x0004F5, 0x010042,
+       0x08000A, 0x000315, 0x010D04, 0x260286,
+       0x004015, 0x000095, 0x010D04, 0x25F086,
+       0x100022, 0x10002A, 0x261A06, 0x000007,
+       0x333104, 0x2AA904, 0x000007, 0x032124,
+       0x280502, 0x284402, 0x001124, 0x400102,
+       0x000424, 0x000424, 0x003224, 0x00292C,
+       0x00636C, 0x277386, 0x000007, 0x02B164,
+       0x000464, 0x000464, 0x00008D, 0x000A64,
+       0x280D02, 0x10008D, 0x000820, 0x0002F5,
+       0x010040, 0x220007, 0x00008D, 0x38B904,
+       0x000007, 0x03296C, 0x30010A, 0x0002F5,
+       0x010042, 0x08000A, 0x000904, 0x270286,
+       0x000007, 0x00212C, 0x28050A, 0x00316C,
+       0x00046C, 0x00046C, 0x28450A, 0x001124,
+       0x006B64, 0x100102, 0x00008D, 0x01096C,
+       0x280D0A, 0x10010D, 0x000820, 0x0002F5,
+       0x010040, 0x220007, 0x004124, 0x000424,
+       0x000424, 0x003224, 0x300102, 0x032944,
+       0x27FA86, 0x000007, 0x300002, 0x0004F5,
+       0x010042, 0x08000A, 0x000315, 0x010D04,
+       0x284086, 0x003124, 0x000464, 0x300102,
+       0x0002F5, 0x010042, 0x08000A, 0x000904,
+       0x284A86, 0x000007, 0x284402, 0x003124,
+       0x300502, 0x003924, 0x300583, 0x000883,
+       0x0005F5, 0x010042, 0x28040A, 0x00008D,
+       0x008124, 0x280D02, 0x00008D, 0x008124,
+       0x281502, 0x10018D, 0x000820, 0x0002F5,
+       0x010040, 0x220007, 0x001025, 0x000575,
+       0x030042, 0x09004A, 0x10000A, 0x0A0904,
+       0x121104, 0x000007, 0x001020, 0x050860,
+       0x050040, 0x0006FD, 0x018042, 0x09004A,
+       0x10000A, 0x0000A5, 0x0A0904, 0x121104,
+       0x000007, 0x000820, 0x019060, 0x010040,
+       0x0002F5, 0x010042, 0x08000A, 0x000904,
+       0x29CA86, 0x000007, 0x244206, 0x000007,
+       0x000606, 0x000007, 0x0002F5, 0x010042,
+       0x08000A, 0x000904, 0x2A1A86, 0x000007,
+       0x000100, 0x080B20, 0x138B60, 0x1B8B60,
+       0x238B60, 0x2B8B60, 0x338B60, 0x3B8B60,
+       0x438B60, 0x4B8B60, 0x538B60, 0x5B8B60,
+       0x638B60, 0x6B8B60, 0x738B60, 0x7B8B60,
+       0x038F60, 0x0B8F60, 0x138F60, 0x1B8F60,
+       0x238F60, 0x2B8F60, 0x338F60, 0x3B8F60,
+       0x438F60, 0x4B8F60, 0x538F60, 0x5B8F60,
+       0x638F60, 0x6B8F60, 0x738F60, 0x7B8F60,
+       0x038A60, 0x000606, 0x018040, 0x00008D,
+       0x000A64, 0x280D02, 0x000A24, 0x00027D,
+       0x018042, 0x10000A, 0x001224, 0x0003FD,
+       0x018042, 0x08000A, 0x000904, 0x2C0A86,
+       0x000007, 0x00018D, 0x000A24, 0x000464,
+       0x000464, 0x080102, 0x000924, 0x000424,
+       0x000424, 0x100102, 0x02000D, 0x009144,
+       0x2C6186, 0x000007, 0x0001FD, 0x018042,
+       0x08000A, 0x000A44, 0x2C4386, 0x018042,
+       0x0A000D, 0x000820, 0x0002FD, 0x018040,
+       0x200007, 0x00027D, 0x001020, 0x000606,
+       0x018040, 0x0002F5, 0x010042, 0x08000A,
+       0x000904, 0x2CB286, 0x000007, 0x00037D,
+       0x018042, 0x08000A, 0x000904, 0x2CE286,
+       0x000007, 0x000075, 0x002E7D, 0x010042,
+       0x0B804A, 0x000020, 0x000904, 0x000686,
+       0x010040, 0x31844A, 0x30048B, 0x000883,
+       0x00008D, 0x000810, 0x28143A, 0x00008D,
+       0x000810, 0x280C3A, 0x000675, 0x010042,
+       0x08000A, 0x003815, 0x010924, 0x280502,
+       0x0B000D, 0x000820, 0x0002F5, 0x010040,
+       0x000606, 0x220007, 0x000464, 0x000464,
+       0x000606, 0x000007, 0x000134, 0x007F8D,
+       0x00093C, 0x281D12, 0x282512, 0x001F32,
+       0x0E0007, 0x00010D, 0x00037D, 0x000820,
+       0x018040, 0x05D2F4, 0x000007, 0x080007,
+       0x00037D, 0x018042, 0x08000A, 0x000904,
+       0x2E8A86, 0x000007, 0x000606, 0x000007,
+       0x000007, 0x000012, 0x100007, 0x320007,
+       0x600007, 0x460007, 0x100080, 0x48001A,
+       0x004904, 0x2EF186, 0x000007, 0x001210,
+       0x58003A, 0x000145, 0x5C5D04, 0x000007,
+       0x000080, 0x48001A, 0x004904, 0x2F4186,
+       0x000007, 0x001210, 0x50003A, 0x005904,
+       0x2F9886, 0x000045, 0x0000C5, 0x7FFFF5,
+       0x7FFF7D, 0x07D524, 0x004224, 0x500102,
+       0x200502, 0x000082, 0x40001A, 0x004104,
+       0x2FC986, 0x000007, 0x003865, 0x40001A,
+       0x004020, 0x00104D, 0x04C184, 0x31AB86,
+       0x000040, 0x040007, 0x000165, 0x000145,
+       0x004020, 0x000040, 0x000765, 0x080080,
+       0x40001A, 0x004104, 0x305986, 0x000007,
+       0x001210, 0x40003A, 0x004104, 0x30B286,
+       0x00004D, 0x0000CD, 0x004810, 0x20043A,
+       0x000882, 0x40001A, 0x004104, 0x30C186,
+       0x000007, 0x004820, 0x005904, 0x319886,
+       0x000040, 0x0007E5, 0x200480, 0x2816A0,
+       0x3216E0, 0x3A16E0, 0x4216E0, 0x021260,
+       0x000040, 0x000032, 0x400075, 0x00007D,
+       0x07D574, 0x200512, 0x000082, 0x40001A,
+       0x004104, 0x317186, 0x000007, 0x038A06,
+       0x640007, 0x0000E5, 0x000020, 0x000040,
+       0x000A65, 0x000020, 0x020040, 0x020040,
+       0x000040, 0x000165, 0x000042, 0x70000A,
+       0x007104, 0x323286, 0x000007, 0x060007,
+       0x019A06, 0x640007, 0x050000, 0x007020,
+       0x000040, 0x038A06, 0x640007, 0x000007,
+       0x00306D, 0x028860, 0x029060, 0x08000A,
+       0x028860, 0x008040, 0x100012, 0x00100D,
+       0x009184, 0x32D186, 0x000E0D, 0x009184,
+       0x33E186, 0x000007, 0x300007, 0x001020,
+       0x003B6D, 0x008040, 0x000080, 0x08001A,
+       0x000904, 0x32F186, 0x000007, 0x001220,
+       0x000DED, 0x008040, 0x008042, 0x10000A,
+       0x40000D, 0x109544, 0x000007, 0x001020,
+       0x000DED, 0x008040, 0x008042, 0x20040A,
+       0x000082, 0x08001A, 0x000904, 0x338186,
+       0x000007, 0x003B6D, 0x008042, 0x08000A,
+       0x000E15, 0x010984, 0x342B86, 0x600007,
+       0x08001A, 0x000C15, 0x010984, 0x341386,
+       0x000020, 0x1A0007, 0x0002ED, 0x008040,
+       0x620007, 0x00306D, 0x028042, 0x0A804A,
+       0x000820, 0x0A804A, 0x000606, 0x10804A,
+       0x000007, 0x282512, 0x001F32, 0x05D2F4,
+       0x54D104, 0x00735C, 0x000786, 0x000007,
+       0x0C0007, 0x0A0007, 0x1C0007, 0x003465,
+       0x020040, 0x004820, 0x025060, 0x40000A,
+       0x024060, 0x000040, 0x454944, 0x000007,
+       0x004020, 0x003AE5, 0x000040, 0x0028E5,
+       0x000042, 0x48000A, 0x004904, 0x39F886,
+       0x002C65, 0x000042, 0x40000A, 0x0000D5,
+       0x454104, 0x000007, 0x000655, 0x054504,
+       0x368286, 0x0001D5, 0x054504, 0x368086,
+       0x002B65, 0x000042, 0x003AE5, 0x50004A,
+       0x40000A, 0x45C3D4, 0x000007, 0x454504,
+       0x000007, 0x0000CD, 0x444944, 0x000007,
+       0x454504, 0x000007, 0x00014D, 0x554944,
+       0x000007, 0x045144, 0x367986, 0x002C65,
+       0x000042, 0x48000A, 0x4CD104, 0x000007,
+       0x04C144, 0x368386, 0x000007, 0x160007,
+       0x002CE5, 0x040042, 0x40000A, 0x004020,
+       0x000040, 0x002965, 0x000042, 0x40000A,
+       0x004104, 0x36F086, 0x000007, 0x002402,
+       0x383206, 0x005C02, 0x0025E5, 0x000042,
+       0x40000A, 0x004274, 0x002AE5, 0x000042,
+       0x40000A, 0x004274, 0x500112, 0x0029E5,
+       0x000042, 0x40000A, 0x004234, 0x454104,
+       0x000007, 0x004020, 0x000040, 0x003EE5,
+       0x000020, 0x000040, 0x002DE5, 0x400152,
+       0x50000A, 0x045144, 0x37DA86, 0x0000C5,
+       0x003EE5, 0x004020, 0x000040, 0x002BE5,
+       0x000042, 0x40000A, 0x404254, 0x000007,
+       0x002AE5, 0x004020, 0x000040, 0x500132,
+       0x040134, 0x005674, 0x0029E5, 0x020042,
+       0x42000A, 0x000042, 0x50000A, 0x05417C,
+       0x0028E5, 0x000042, 0x48000A, 0x0000C5,
+       0x4CC144, 0x38A086, 0x0026E5, 0x0027E5,
+       0x020042, 0x40004A, 0x50000A, 0x00423C,
+       0x00567C, 0x0028E5, 0x004820, 0x000040,
+       0x281D12, 0x282512, 0x001F72, 0x002965,
+       0x000042, 0x40000A, 0x004104, 0x393A86,
+       0x0E0007, 0x160007, 0x1E0007, 0x003EE5,
+       0x000042, 0x40000A, 0x004104, 0x397886,
+       0x002D65, 0x000042, 0x28340A, 0x003465,
+       0x020042, 0x42004A, 0x004020, 0x4A004A,
+       0x50004A, 0x05D2F4, 0x54D104, 0x00735C,
+       0x39E186, 0x000007, 0x000606, 0x080007,
+       0x0C0007, 0x080007, 0x0A0007, 0x0001E5,
+       0x020045, 0x004020, 0x000060, 0x000365,
+       0x000040, 0x002E65, 0x001A20, 0x0A1A60,
+       0x000040, 0x003465, 0x020042, 0x42004A,
+       0x004020, 0x4A004A, 0x000606, 0x50004A,
+       0x0017FD, 0x018042, 0x08000A, 0x000904,
+       0x225A86, 0x000007, 0x00107D, 0x018042,
+       0x0011FD, 0x33804A, 0x19804A, 0x20000A,
+       0x000095, 0x2A1144, 0x01A144, 0x3B9086,
+       0x00040D, 0x00B184, 0x3B9186, 0x0018FD,
+       0x018042, 0x0010FD, 0x09804A, 0x38000A,
+       0x000095, 0x010924, 0x003A64, 0x3B8186,
+       0x000007, 0x003904, 0x3B9286, 0x000007,
+       0x3B9A06, 0x00000D, 0x00008D, 0x000820,
+       0x00387D, 0x018040, 0x700002, 0x00117D,
+       0x018042, 0x00197D, 0x29804A, 0x30000A,
+       0x380002, 0x003124, 0x000424, 0x000424,
+       0x002A24, 0x280502, 0x00068D, 0x000810,
+       0x28143A, 0x00750D, 0x00B124, 0x002264,
+       0x3D0386, 0x284402, 0x000810, 0x280C3A,
+       0x0B800D, 0x000820, 0x0002FD, 0x018040,
+       0x200007, 0x00758D, 0x00B124, 0x100102,
+       0x012144, 0x3E4986, 0x001810, 0x10003A,
+       0x00387D, 0x018042, 0x08000A, 0x000904,
+       0x3E4886, 0x030000, 0x3E4A06, 0x0000BD,
+       0x00008D, 0x023164, 0x000A64, 0x280D02,
+       0x0B808D, 0x000820, 0x0002FD, 0x018040,
+       0x200007, 0x00387D, 0x018042, 0x08000A,
+       0x000904, 0x3E3286, 0x030000, 0x0002FD,
+       0x018042, 0x08000A, 0x000904, 0x3D8286,
+       0x000007, 0x002810, 0x28043A, 0x00750D,
+       0x030924, 0x002264, 0x280D02, 0x02316C,
+       0x28450A, 0x0B810D, 0x000820, 0x0002FD,
+       0x018040, 0x200007, 0x00008D, 0x000A24,
+       0x3E4A06, 0x100102, 0x001810, 0x10003A,
+       0x0000BD, 0x003810, 0x30043A, 0x00187D,
+       0x018042, 0x0018FD, 0x09804A, 0x20000A,
+       0x0000AD, 0x028924, 0x07212C, 0x001010,
+       0x300583, 0x300D8B, 0x3014BB, 0x301C83,
+       0x002083, 0x00137D, 0x038042, 0x33844A,
+       0x33ACCB, 0x33B4CB, 0x33BCCB, 0x33C4CB,
+       0x33CCCB, 0x33D4CB, 0x305C8B, 0x006083,
+       0x001E0D, 0x0005FD, 0x018042, 0x20000A,
+       0x020924, 0x00068D, 0x00A96C, 0x00009D,
+       0x0002FD, 0x018042, 0x08000A, 0x000904,
+       0x3F6A86, 0x000007, 0x280502, 0x280D0A,
+       0x284402, 0x001810, 0x28143A, 0x0C008D,
+       0x000820, 0x0002FD, 0x018040, 0x220007,
+       0x003904, 0x225886, 0x001E0D, 0x00057D,
+       0x018042, 0x20000A, 0x020924, 0x0000A5,
+       0x0002FD, 0x018042, 0x08000A, 0x000904,
+       0x402A86, 0x000007, 0x280502, 0x280C02,
+       0x002010, 0x28143A, 0x0C010D, 0x000820,
+       0x0002FD, 0x018040, 0x225A06, 0x220007,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000,
+       0x000000, 0x000000, 0x000000, 0x000000
+};
+
+#endif //_HWMCODE_
index 9165779cb117bf83021884b5cb5d3a8149c362a4..a8ffa3aba6903281965df825980ff1ff72a8e063 100644 (file)
@@ -557,7 +557,7 @@ static struct usb_driver plusb_driver =
 
 /* --------------------------------------------------------------------- */
 
-int __init plusb_init (void)
+static int __init plusb_init (void)
 {
        unsigned u;
        dbg("plusb_init");
@@ -583,7 +583,7 @@ int __init plusb_init (void)
 
 /* --------------------------------------------------------------------- */
 
-void __exit plusb_cleanup (void)
+static void __exit plusb_cleanup (void)
 {
        unsigned u;
 
@@ -601,21 +601,11 @@ void __exit plusb_cleanup (void)
 
 /* --------------------------------------------------------------------- */
 
-#ifdef MODULE
 MODULE_AUTHOR ("Deti Fliegl, deti@fliegl.de");
 MODULE_DESCRIPTION ("PL-2302 USB Interface Driver for Linux (c)2000");
 
-/* --------------------------------------------------------------------- */
-int __init init_module (void)
-{
-       return plusb_init ();
-}
-/* --------------------------------------------------------------------- */
-void __exit cleanup_module (void)
-{
-       plusb_cleanup ();
-}
 
-#endif
+module_init (plusb_init);
+module_exit (plusb_cleanup);
 
 /* --------------------------------------------------------------------- */
index a1e0acfd3cf46ba555d982638b9b8fcd78e483b3..824d634ba924f006254ecdd74c2118ab5f306af0 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/sched.h>
@@ -49,6 +50,7 @@ static int handle_pm_event(struct pm_dev *dev, pm_request_t rqst, void *data);
 
 static int debug = 1;
 MODULE_PARM(debug, "i");
+MODULE_PARM_DESC(debug, "Debug level");
 
 static kmem_cache_t *uhci_td_cachep;
 static kmem_cache_t *uhci_qh_cachep;
@@ -1296,6 +1298,7 @@ static int uhci_submit_urb(struct urb *urb)
        struct uhci *uhci;
        unsigned long flags;
        struct urb *u;
+       int bustime;
 
        if (!urb)
                return -EINVAL;
@@ -1325,13 +1328,40 @@ static int uhci_submit_urb(struct urb *urb)
                ret = uhci_submit_control(urb);
                break;
        case PIPE_INTERRUPT:
-               ret = uhci_submit_interrupt(urb);
+               if (urb->bandwidth == 0) {      /* not yet checked/allocated */
+                       bustime = usb_check_bandwidth (urb->dev, urb);
+                       if (bustime < 0)
+                               ret = bustime;
+                       else {
+                               ret = uhci_submit_interrupt(urb);
+                               if (ret == -EINPROGRESS)
+                                       usb_claim_bandwidth (urb->dev, urb, bustime, 0);
+                       }
+               } else {        /* bandwidth is already set */
+                       ret = uhci_submit_interrupt(urb);
+               }
                break;
        case PIPE_BULK:
                ret = uhci_submit_bulk(urb, u);
                break;
        case PIPE_ISOCHRONOUS:
-               ret = uhci_submit_isochronous(urb);
+               if (urb->bandwidth == 0) {      /* not yet checked/allocated */
+                       if (urb->number_of_packets <= 0) {
+                               ret = -EINVAL;
+                               break;
+                       }
+                       bustime = usb_check_bandwidth (urb->dev, urb);
+                       if (bustime < 0) {
+                               ret = bustime;
+                               break;
+                       }
+
+                       ret = uhci_submit_isochronous(urb);
+                       if (ret == -EINPROGRESS)
+                               usb_claim_bandwidth (urb->dev, urb, bustime, 1);
+               } else {        /* bandwidth is already set */
+                       ret = uhci_submit_isochronous(urb);
+               }
                break;
        }
 
@@ -1387,6 +1417,10 @@ static void uhci_transfer_result(struct urb *urb)
        case PIPE_CONTROL:
        case PIPE_BULK:
        case PIPE_ISOCHRONOUS:
+               /* Release bandwidth for Interrupt or Isoc. transfers */
+               /* Spinlock needed ? */
+               if (urb->bandwidth)
+                       usb_release_bandwidth (urb->dev, urb, 1);
                uhci_unlink_generic(urb);
                break;
        case PIPE_INTERRUPT:
@@ -1394,8 +1428,13 @@ static void uhci_transfer_result(struct urb *urb)
                urb->complete(urb);
                if (urb->interval)
                        uhci_reset_interrupt(urb);
-               else
+               else {
+                       /* Release bandwidth for Interrupt or Isoc. transfers */
+                       /* Spinlock needed ? */
+                       if (urb->bandwidth)
+                               usb_release_bandwidth (urb->dev, urb, 0);
                        uhci_unlink_generic(urb);
+               }
                return;         /* <-- Note the return */
        }
 
@@ -1476,6 +1515,21 @@ static int uhci_unlink_urb(struct urb *urb)
        if (usb_pipedevice(urb->pipe) == uhci->rh.devnum)
                return rh_unlink_urb(urb);
 
+       /* Release bandwidth for Interrupt or Isoc. transfers */
+       /* Spinlock needed ? */
+       if (urb->bandwidth) {
+               switch (usb_pipetype(urb->pipe)) {
+               case PIPE_INTERRUPT:
+                       usb_release_bandwidth (urb->dev, urb, 0);
+                       break;
+               case PIPE_ISOCHRONOUS:
+                       usb_release_bandwidth (urb->dev, urb, 1);
+                       break;
+               default:
+                       break;
+               }
+       }
+
        if (urb->status == -EINPROGRESS) {
                uhci_unlink_generic(urb);
 
@@ -2372,7 +2426,7 @@ static int handle_pm_event(struct pm_dev *dev, pm_request_t rqst, void *data)
        return 0;
 }
 
-int uhci_init(void)
+static int __init uhci_init(void)
 {
        int retval;
        struct pci_dev *dev;
@@ -2478,16 +2532,15 @@ void uhci_cleanup(void)
                printk(KERN_INFO "uhci: not all TD's were freed\n");
 }
 
-#ifdef MODULE
-int init_module(void)
-{
-       return uhci_init();
-}
-
-void cleanup_module(void)
+static void __exit uhci_exit(void)
 {
        pm_unregister_all(handle_pm_event);
        uhci_cleanup();
 }
-#endif //MODULE
+
+module_init(uhci_init);
+module_exit(uhci_exit);
+
+MODULE_AUTHOR("Linus Torvalds, Johannes Erdfelt, Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber");
+MODULE_DESCRIPTION("USB Universal Host Controller Interface driver");
 
index 4bfbc134636cbd434dd6920dc09fb56f38db9e00..4d2bcaf9bea94cacb6410fd0efe4680f83f2df62 100644 (file)
@@ -1,10 +1,10 @@
 /* 
  * Universal Host Controller Interface driver for USB (take II).
  *
- * (c) 1999 Georg Acher, acher@in.tum.de (executive slave) (base guitar)
- *          Deti Fliegl, deti@fliegl.de (executive slave) (lead voice)
- *          Thomas Sailer, sailer@ife.ee.ethz.ch (chief consultant) (cheer leader)
- *          Roman Weissgaerber, weissg@vienna.at (virt root hub) (studio porter)
+ * (c) 1999-2000 Georg Acher, acher@in.tum.de (executive slave) (base guitar)
+ *               Deti Fliegl, deti@fliegl.de (executive slave) (lead voice)
+ *               Thomas Sailer, sailer@ife.ee.ethz.ch (chief consultant) (cheer leader)
+ *               Roman Weissgaerber, weissg@vienna.at (virt root hub) (studio porter)
  *          
  * HW-initalization based on material of
  *
@@ -12,7 +12,7 @@
  * (C) Copyright 1999 Johannes Erdfelt
  * (C) Copyright 1999 Randy Dunlap
  *
- * $Id: usb-uhci.c,v 1.232 2000/06/11 13:18:30 acher Exp $
+ * $Id: usb-uhci.c,v 1.237 2000/08/08 14:58:17 acher Exp $
  */
 
 #include <linux/config.h>
@@ -48,7 +48,7 @@
 /* This enables an extra UHCI slab for memory debugging */
 #define DEBUG_SLAB
 
-#define VERSTR "$Revision: 1.232 $ time " __TIME__ " " __DATE__
+#define VERSTR "$Revision: 1.237 $ time " __TIME__ " " __DATE__
 
 #include <linux/usb.h>
 #include "usb-uhci.h"
@@ -791,7 +791,7 @@ _static int uhci_submit_bulk_urb (urb_t *urb, urb_t *bulk_urb)
        char *data;
        unsigned int pipe = urb->pipe;
        int maxsze = usb_maxpacket (urb->dev, pipe, usb_pipeout (pipe));
-       int info, len;
+       int info, len, last;
        int depth_first=USE_BULK_DEPTH_FIRST;  // UHCI descriptor chasing method
        urb_priv_t *upriv, *bpriv;
 
@@ -888,13 +888,15 @@ _static int uhci_submit_bulk_urb (urb_t *urb, urb_t *bulk_urb)
                data += pktsze;
                len -= pktsze;
 
-               if (!len)
+               last = (len == 0 && (usb_pipein(pipe) || pktsze < maxsze || !(urb->transfer_flags & USB_DISABLE_SPD)));
+
+               if (last)
                        td->hw.td.status |= TD_CTRL_IOC;        // last one generates INT
 
                insert_td (s, qh, td, UHCI_PTR_DEPTH * depth_first);
                usb_dotoggle (urb->dev, usb_pipeendpoint (pipe), usb_pipeout (pipe));
 
-       } while (len > 0);
+       } while (!last);
 
        list_add (&qh->desc_list, &urb_priv->desc_list);
 
@@ -1036,11 +1038,18 @@ _static int uhci_unlink_urb_sync (uhci_t *s, urb_t *urb)
 
        spin_lock_irqsave (&s->urb_list_lock, flags);
 
+       if (!in_interrupt())            // shouldn't be called from interrupt at all...
+               spin_lock(&urb->lock); 
+       
        if (urb->status == -EINPROGRESS) {
                // URB probably still in work
                dequeue_urb (s, urb);
                uhci_switch_timer_int(s);
                s->unlink_urb_done=1;
+
+               if (!in_interrupt())    
+                       spin_unlock(&urb->lock); 
+
                spin_unlock_irqrestore (&s->urb_list_lock, flags);              
                
                urb->status = -ENOENT;  // mark urb as killed           
@@ -1076,10 +1085,13 @@ _static int uhci_unlink_urb_sync (uhci_t *s, urb_t *urb)
                        urb->complete ((struct urb *) urb);
                }
                usb_dec_dev_use (urb->dev);
-               return 0;
        }
-       else
+       else {
+               if (!in_interrupt())    
+                       spin_unlock(&urb->lock); 
                spin_unlock_irqrestore (&s->urb_list_lock, flags);
+       }
+
        return 0;
 }
 /*-------------------------------------------------------------------*/
@@ -1198,9 +1210,10 @@ _static int uhci_unlink_urb_async (uhci_t *s,urb_t *urb)
                        break;
                }
                ((urb_priv_t*)urb->hcpriv)->started = UHCI_GET_CURRENT_FRAME(s);
+               return -EINPROGRESS;  // completion will follow
        }               
 
-       return -EINPROGRESS;
+       return 0;    // URB already dead
 }
 /*-------------------------------------------------------------------*/
 _static int uhci_unlink_urb (urb_t *urb)
@@ -1222,9 +1235,20 @@ _static int uhci_unlink_urb (urb_t *urb)
        if (urb->transfer_flags & USB_ASYNC_UNLINK) {
                int ret;
 
-               spin_lock_irqsave (&s->urb_list_lock, flags);
+                       spin_lock_irqsave (&s->urb_list_lock, flags);
+
+               // The URB needs to be locked if called outside completion context
+
+               if (!in_interrupt())
+                       spin_lock(&urb->lock);
+
                ret = uhci_unlink_urb_async(s, urb);
-               spin_unlock_irqrestore (&s->urb_list_lock, flags);
+
+               if (!in_interrupt())
+                       spin_unlock(&urb->lock);
+
+               spin_unlock_irqrestore (&s->urb_list_lock, flags);      
+
                return ret;
        }
        else
@@ -1393,8 +1417,10 @@ _static int uhci_submit_iso_urb (urb_t *urb)
 {
        uhci_t *s = (uhci_t*) urb->dev->bus->hcpriv;
        urb_priv_t *urb_priv = urb->hcpriv;
+#ifdef ISO_SANITY_CHECK
        int pipe=urb->pipe;
        int maxsze = usb_maxpacket (urb->dev, pipe, usb_pipeout (pipe));
+#endif
        int n, ret, last=0;
        uhci_desc_t *td, **tdm;
        int status, destination;
@@ -1422,18 +1448,18 @@ _static int uhci_submit_iso_urb (urb_t *urb)
                        tdm[n] = 0;
                        continue;
                }
-               
-               if(urb->iso_frame_desc[n].length > maxsze) {
+
 #ifdef ISO_SANITY_CHECK
+               if(urb->iso_frame_desc[n].length > maxsze) {
+
                        err("submit_iso: urb->iso_frame_desc[%d].length(%d)>%d",n , urb->iso_frame_desc[n].length, maxsze);
                        tdm[n] = 0;
-                       ret=-EINVAL;
-                       goto inval;
-#endif
+                       ret=-EINVAL;            
                }
-               
+               else
+#endif
                ret = alloc_td (&td, UHCI_PTR_DEPTH);
-       inval:
+
                if (ret) {
                        int i;  // Cleanup allocated TDs
 
@@ -2175,10 +2201,9 @@ _static int process_transfer (uhci_t *s, urb_t *urb, int mode)
                        usb_endpoint_halt (urb->dev, usb_pipeendpoint (urb->pipe), usb_pipeout (urb->pipe));
                }
 
-               if (status != 0) {              // if any error occured stop processing of further TDs
+               if (status && (status != -EPIPE)) {     // if any error occurred stop processing of further TDs
                        // only set ret if status returned an error
-                       if (status != -EPIPE) 
-                               uhci_show_td (desc);
+  is_error:
                        ret = status;
                        urb->error_count++;
                        break;
@@ -2210,6 +2235,8 @@ _static int process_transfer (uhci_t *s, urb_t *urb, int mode)
                        data_toggle = uhci_toggle (desc->hw.td.info);
                        break;
                }
+               else if (status)
+                       goto is_error;
 
                data_toggle = uhci_toggle (desc->hw.td.info);
                queue_dbg("process_transfer: len:%d status:%x mapped:%x toggle:%d", actual_length, desc->hw.td.status,status, data_toggle);      
@@ -2455,10 +2482,11 @@ _static int process_urb (uhci_t *s, struct list_head *p)
                                        is_ring = 1;
                        }
 
+                       spin_lock(&urb->lock);
                        spin_unlock(&s->urb_list_lock);
 
-                       // In case you need the current URB status for your completion handler
-                       if (urb->complete && (!proceed || (urb->transfer_flags & USB_URB_EARLY_COMPLETE))) {
+                       // In case you need the current URB status for your completion handler (before resubmit)
+                       if (urb->complete && (!proceed )) {
                                dbg("process_transfer: calling early completion");
                                urb->complete ((struct urb *) urb);
                                if (!proceed && is_ring && (urb->status != -ENOENT))
@@ -2476,15 +2504,15 @@ _static int process_urb (uhci_t *s, struct list_head *p)
                                }
                                while (tmp != NULL && tmp != urb->next);        // submit until we reach NULL or our own pointer or submit fails
 
-                               if (urb->complete && !(urb->transfer_flags & USB_URB_EARLY_COMPLETE)) {
+                               if (urb->complete) {
                                        dbg("process_transfer: calling completion");
                                        urb->complete ((struct urb *) urb);
                                }
                        }
 
-                       spin_lock(&s->urb_list_lock);
-
                        usb_dec_dev_use (urb->dev);
+                       spin_unlock(&urb->lock);                
+                       spin_lock(&s->urb_list_lock);
                }
        }
 
@@ -2511,8 +2539,8 @@ _static void uhci_interrupt (int irq, void *__uhci, struct pt_regs *regs)
        dbg("interrupt");
 
        if (status != 1) {
-               /* warn("interrupt, status %x, frame# %i", status, 
-                    UHCI_GET_CURRENT_FRAME(s)); */
+               warn("interrupt, status %x, frame# %i", status, 
+                    UHCI_GET_CURRENT_FRAME(s));
 
                // remove host controller halted state
                if ((status&0x20) && (s->running)) {
@@ -2788,17 +2816,13 @@ _static int __init start_uhci (struct pci_dev *dev)
                        break;
                /* disable legacy emulation */
                pci_write_config_word (dev, USBLEGSUP, USBLEGSUP_DEFAULT);
-               if(dev->vendor==0x8086) {
-                       info("Intel USB controller: setting latency timer to %d", UHCI_LATENCY_TIMER);
-                       pci_write_config_byte(dev, PCI_LATENCY_TIMER, UHCI_LATENCY_TIMER);
-               }
        
                return alloc_uhci(dev, dev->irq, io_addr, io_size);
        }
        return -1;
 }
 
-int __init uhci_init (void)
+static int __init uhci_init (void)
 {
        int retval = -ENODEV;
        struct pci_dev *dev = NULL;
@@ -2818,7 +2842,6 @@ int __init uhci_init (void)
        
        if(!urb_priv_kmem) {
                err("kmem_cache_create for urb_priv_t failed (out of memory)");
-               kmem_cache_destroy(urb_priv_kmem);
                return -ENOMEM;
        }
 #endif 
@@ -2853,19 +2876,10 @@ int __init uhci_init (void)
                        i++;
        }
 
-#ifdef DEBUG_SLAB
-       if (retval < 0 ) {
-               if(kmem_cache_destroy(uhci_desc_kmem))
-                       err("uhci_desc_kmem remained");
-               if(kmem_cache_destroy(urb_priv_kmem))
-                       err("urb_priv_kmem remained");
-       }
-#endif
-       
        return retval;
 }
 
-void __exit uhci_cleanup (void)
+static void __exit uhci_cleanup (void)
 {
        uhci_t *s;
        while ((s = devs)) {
@@ -2881,16 +2895,15 @@ void __exit uhci_cleanup (void)
 #endif
 }
 
-#ifdef MODULE
-int init_module (void)
-{
-       return uhci_init ();
-}
-
-void cleanup_module (void)
+static void __exit uhci_exit (void)
 {
        pm_unregister_all (handle_pm_event);
        uhci_cleanup ();
 }
 
-#endif //MODULE
+module_init(uhci_init);
+module_exit(uhci_exit);
+
+MODULE_AUTHOR("Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber");
+MODULE_DESCRIPTION("USB Universal Host Controller Interface driver");
+
index de2821e4709756664056b8e10f435e0bd66ec3c0..b74a003e8f1f6c7f95bec6a68225bdf92c8d502d 100644 (file)
@@ -51,6 +51,7 @@
 #include <linux/usb.h>
 
 MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
+MODULE_DESCRIPTION("USB Wacom Graphire and Wacom Intuos tablet driver");
 
 /*
  * Wacom Graphire packet:
index d8c4d6e6b40fa2599e45cac6279bd9831ed24716..c48db4640c2de8d5c824e34a50de44802d72b754 100644 (file)
@@ -49,6 +49,9 @@ extern int init_coda(void);
 extern int init_devpts_fs(void);
 #endif
 
+extern int init_adfs_fs(void);
+
+
 void __init filesystem_setup(void)
 {
 #ifdef CONFIG_EXT2_FS
index cf5e1cdbeabcab830b6d9cf8b6389e2b9ed0d294..a293b0720b4abf04dec0881b1068f4c5d744551e 100644 (file)
@@ -11,6 +11,7 @@
 #include <linux/sched.h>
 #include <linux/utsname.h>
 #include <linux/nfs.h>
+#include <linux/nfs2.h>
 
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/clnt.h>
@@ -19,6 +20,7 @@
 #include <linux/lockd/lockd.h>
 #include <linux/lockd/sm_inter.h>
 
+
 #define NLMDBG_FACILITY                NLMDBG_XDR
 #define NLM_MAXSTRLEN          1024
 #define OFFSET_MAX             LONG_MAX
index 8c4d40c29d96bd78a4e6599f084f7e5d1f7daf4a..f386f963a2dae7c9ff55e00e2a4995bbad7cc2fb 100644 (file)
@@ -11,6 +11,8 @@
 #include <linux/sched.h>
 #include <linux/utsname.h>
 #include <linux/nfs.h>
+#include <linux/nfs2.h>
+#include <linux/nfs3.h>
 
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/clnt.h>
index b9edef0bb12e8efb9131405fa2564f81b2844928..2607e06589ac5510855fd29b933c4739e1b13e5b 100644 (file)
@@ -29,7 +29,6 @@
 
 static int proc_root_readdir(struct file *, void *, filldir_t);
 static struct dentry *proc_root_lookup(struct inode *,struct dentry *);
-static int proc_unlink(struct inode *, struct dentry *);
 
 static unsigned char proc_alloc_map[PROC_NDYNAMIC / 8] = {0};
 
@@ -86,7 +85,7 @@ struct inode_operations proc_dyna_dir_inode_operations = {
        NULL,                   /* create */
        proc_lookup,            /* lookup */
        NULL,                   /* link */
-       proc_unlink,            /* unlink(struct inode *, struct dentry *) */
+       NULL,                   /* unlink(struct inode *, struct dentry *) */
        NULL,                   /* symlink      */
        NULL,                   /* mkdir */
        NULL,                   /* rmdir */
@@ -990,15 +989,3 @@ static int proc_root_readdir(struct file * filp,
        }
        return 0;
 }
-
-static int proc_unlink(struct inode *dir, struct dentry *dentry)
-{
-       struct proc_dir_entry * dp = dir->u.generic_ip;
-
-printk("proc_file_unlink: deleting %s/%s\n", dp->name, dentry->d_name.name);
-
-       remove_proc_entry(dentry->d_name.name, dp);
-       dentry->d_inode->i_nlink = 0;
-       d_delete(dentry);
-       return 0;
-}
index ebdb8b790f9bfa5b3c188cbef96e445569558833..fad1d80ba5735bc60cd7195639d4c5b0f5cd38c2 100644 (file)
@@ -130,7 +130,7 @@ struct __xchg_dummy { unsigned long a[100]; };
 /*
  * Note: no "lock" prefix even on SMP: xchg always implies lock anyway
  */
-static inline unsigned long __xchg(unsigned long x, void * ptr, int size)
+static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
 {
        switch (size) {
                case 1:
index 4c2d1914a30c5a11fd13f69cd36890e49ece045f..0dee37c21ffc2b5a8449c854cd4e517e895eecd6 100644 (file)
@@ -142,6 +142,7 @@ struct ac97_codec {
        char *name;
        int id;
        int dev_mixer; 
+       int type;
 
        /* codec specific init/reset routines, used mainly for 4 or 6 channel support */
        int  (*codec_init)  (struct ac97_codec *codec);
index a350944506a5553817b86ba23d4deed0dceb4b45..22a2c5971cb4657ad356c37f47dc63003d697070 100644 (file)
@@ -50,8 +50,9 @@ enum chipset_type {
        VIA_VP3,
        VIA_MVP3,
        VIA_MVP4,
-       VIA_APOLLO_SUPER,
        VIA_APOLLO_PRO,
+       VIA_APOLLO_KT133,
+       VIA_APOLLO_KX133,
        SIS_GENERIC,
        AMD_GENERIC,
        AMD_IRONGATE,
@@ -225,4 +226,7 @@ extern void agp_backend_release(void);
  * 
  */
 
+/* Don't call this directly!! used in initialization */
+extern int agp_init(void);
+
 #endif                         /* _AGP_BACKEND_H */
index ae0f159ee2c678dad3ba5fdc8075d40be4504463..57064b6150d0c839649a54d5b325f483a80ad7c5 100644 (file)
@@ -140,7 +140,7 @@ struct JS_DATA_SAVE_TYPE {
 #define __exit
 #define BASE_ADDRESS(x,i)      ((x)->base_address[i])
 #define SETUP_PARAM            char *str
-#define SETUP_PARSE(x)         int ints[x]; get_options(str, x, ints)
+#define SETUP_PARSE(x)         int ints[x]; get_options(str, ints)
 #else
 #define BASE_ADDRESS(x,i)      ((x)->resource[i].start)
 #define SETUP_PARAM            char *str
index 73a0a689e5639d31a82dfa25fc415062536cd889..0f14098055a7f1d4afeddc4096d6e80779dd89ed 100644 (file)
@@ -48,6 +48,7 @@ NORET_TYPE void do_exit(long error_code)
        ATTRIB_NORET;
 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
 extern long simple_strtol(const char *,char **,unsigned int);
+extern char *get_options(char *str, int *ints);
 extern int sprintf(char * buf, const char * fmt, ...);
 extern int vsprintf(char *buf, const char *, va_list);
 
index 1608d73329d7e07b37f6c77844ae9f857ac970e4..4aea75930ac90e7fa342d7b380d7b26ffc6d85d9 100644 (file)
 
 #define NFS2_MAXPATHLEN                1024
 #define NFS2_MAXNAMLEN         255
-#define NFS2_FHSIZE            NFS_FHSIZE
 #define NFS2_COOKIESIZE                4
 
 #define NFS3_MAXPATHLEN                PATH_MAX
 #define NFS3_MAXNAMLEN         NAME_MAX
-#define NFS3_FHSIZE            NFS_FHSIZE
 #define NFS3_COOKIEVERFSIZE    8
 #define NFS3_CREATEVERFSIZE    8
 #define NFS3_WRITEVERFSIZE     8
index 4f02524f4cbfc8ac96d5c0daeaaf57f56930eb9f..910dfb38d80ffbefd7e07d41f71f09ab66f75a33 100644 (file)
 #define PCI_DEVICE_ID_APPLE_BANDIT     0x0001
 #define PCI_DEVICE_ID_APPLE_GC         0x0002
 #define PCI_DEVICE_ID_APPLE_HYDRA      0x000e
+#define PCI_VENDOR_ID_YAMAHA           0x1073
+#define PCI_DEVICE_ID_YAMAHA_724       0x0004
+#define PCI_DEVICE_ID_YAMAHA_724F      0x000d
+#define PCI_DEVICE_ID_YAMAHA_740       0x000a
+#define PCI_DEVICE_ID_YAMAHA_740C      0x000c
+#define PCI_DEVICE_ID_YAMAHA_744       0x0010
+#define PCI_DEVICE_ID_YAMAHA_754       0x0012
 
 #define PCI_VENDOR_ID_NEXGEN           0x1074
 #define PCI_DEVICE_ID_NEXGEN_82C501    0x4e78
index 5ac507bd52f547699a3cd571711c575db8e13f2c..6ba01425d129771946a239b96e1812995b9a291b 100644 (file)
@@ -183,7 +183,7 @@ extern struct x25_neigh *x25_get_neigh(struct device *);
 extern void x25_link_free(void);
 
 /* x25_out.c */
-extern void x25_output(struct sock *, struct sk_buff *);
+extern  int x25_output(struct sock *, struct sk_buff *);
 extern void x25_kick(struct sock *);
 extern void x25_enquiry_response(struct sock *);
 
index a988647568c7146120858a384274d64ccc43aa0a..04523e0a92e7acb62e8d39e5d7890fd14321973e 100644 (file)
@@ -115,9 +115,8 @@ int request_dma(unsigned int dmanr, const char *device_id)
        return -EINVAL;
 }
 
-int free_dma(unsigned int dmanr)
+void free_dma(unsigned int dmanr)
 {
-       return -EINVAL;
 }
 
 int get_dma_list(char *buf)
index c05374b998e742c7234cfcf3ebf2658a0ad148aa..0b39f98d12f8b051af2331dba2ef1dad3638337c 100644 (file)
@@ -77,15 +77,13 @@ MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_MASQ_APP_PORTS) "i");
  * List of supported DCC protocols
  */
 
-#define NUM_DCCPROTO 5
-
 struct dccproto 
 {
   char *match;
   int matchlen;
 };
 
-struct dccproto dccprotos[NUM_DCCPROTO] = {
+struct dccproto dccprotos[] = {
  { "SEND ", 5 },
  { "CHAT ", 5 },
  { "MOVE ", 5 },
@@ -93,6 +91,9 @@ struct dccproto dccprotos[NUM_DCCPROTO] = {
  { "SCHAT ", 6 },
  { "ACCEPT ", 7 },
 };
+
+#define NUM_DCCPROTO (sizeof dccprotos / sizeof dccprotos[0])
+
 #define MAXMATCHLEN 7
 
 static int
@@ -225,7 +226,7 @@ masq_irc_out (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff **skb
                                 * Replace the old "address port" with the new one
                                 */
 
-                               buf_len = sprintf(buf,"%lu %u",
+                               buf_len = sprintf(buf,"%u %u",
                                                ntohl(n_ms->maddr),ntohs(n_ms->mport));
 
                                /*
@@ -347,7 +348,7 @@ masq_irc_in (struct ip_masq_app *mapp, struct ip_masq *ms, struct sk_buff **skb_
                 * Replace the outside address with the inside address
                 */
 
-               buf_len = sprintf(buf,"%lu %u",
+               buf_len = sprintf(buf,"%u %u",
                        ntohl(n_ms->saddr),ntohs(n_ms->sport));
 
                /*
index 120b59f1d0331d4c875f610a30db7b4f1e16975c..eb56019420bbe5c5a24cf06b39abb73bd6467ba3 100644 (file)
@@ -401,7 +401,7 @@ static int ip_masq_user_info(char *buffer, char **start, off_t offset,
 
                magic_control = atomic_read(&ms->n_control);
                if (!magic_control && ms->control) magic_control = -1;
-               sprintf(temp,"%-4s %08lX:%04X %08lX:%04X %08lX:%04X %-12s %3X %4d %3d %7lu %4d %4d",
+               sprintf(temp,"%-4s %08X:%04X %08X:%04X %08X:%04X %-12s %3X %4d %3d %7lu %4d %4d",
                        masq_proto_name(ms->protocol),
                        ntohl(ms->saddr), ntohs(ms->sport),
                        ntohl(ms->daddr), ntohs(ms->dport),
index 5028f616712b2c8cf6062c89bf10cd081d758276..77ca3738ee5f243f5f94080aeeb3a621090a812f 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/in.h>
 #include <linux/sunrpc/xdr.h>
 #include <linux/sunrpc/msg_prot.h>
+#include <linux/nfs2.h>
 
 u32    rpc_success, rpc_prog_unavail, rpc_prog_mismatch, rpc_proc_unavail,
        rpc_garbage_args, rpc_system_err;
index e2eda9ef5173639af97850ae40c8ec6781214f54..259e6d33456fb2260c1a92acc645b40779a6e90b 100644 (file)
  *     X.25 001        Jonathan Naylor Started coding.
  *     X.25 002        Jonathan Naylor Centralised disconnect handling.
  *                                     New timer architecture.
- *     2000-11-03      Henner Eisen    MSG_EOR handling more POSIX compliant.
+ *     2000-03-11      Henner Eisen    MSG_EOR handling more POSIX compliant.
+ *     2000-08-27      Arnaldo C. Melo s/suser/capable/
+ *     2000-04-09      Henner Eisen    Set sock->state in x25_accept().
+ *                                     Fixed x25_output() related skb leakage.
  */
 
 #include <linux/config.h>
@@ -726,6 +729,7 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
        kfree_skb(skb);
        sk->ack_backlog--;
        newsock->sk = newsk;
+       newsock->state = SS_CONNECTED;
 
        return 0;
 }
@@ -971,7 +975,11 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, int len, struct
        if (msg->msg_flags & MSG_OOB) {
                skb_queue_tail(&sk->protinfo.x25->interrupt_out_queue, skb);
        } else {
-               x25_output(sk, skb);
+               err = x25_output(sk, skb);
+               if(err){
+                       len = err;
+                       kfree_skb(skb);
+               }
        }
 
        x25_kick(sk);
@@ -1116,7 +1124,7 @@ static int x25_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
                        return x25_subscr_ioctl(cmd, (void *)arg);
 
                case SIOCX25SSUBSCRIP:
-                       if (!suser()) return -EPERM;
+                       if (!capable(CAP_NET_ADMIN)) return -EPERM;
                        return x25_subscr_ioctl(cmd, (void *)arg);
 
                case SIOCX25GFACILITIES: {
index bcbf31b0dfca2cb26b538b02dccc16b939c0b00e..d19bb7f4d2ccac1e6947f1cf4f70d83686ab5c53 100644 (file)
@@ -14,6 +14,7 @@
  *
  *     History
  *     X.25 001        Jonathan Naylor Started coding.
+ *      2000-09-04     Henner Eisen    Prevent freeing a dangling skb.
  */
 
 #include <linux/config.h>
@@ -85,12 +86,13 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *neigh)
                return x25_rx_call_request(skb, neigh, lci);
 
        /*
-        *      Its not a Call Request, nor is it a control frame, throw it awa
+        *      Its not a Call Request, nor is it a control frame.
+        *      Let caller throw it away.
         */
 /*
        x25_transmit_clear_request(neigh, lci, 0x0D);
 */
-       kfree_skb(skb);
+       printk(KERN_DEBUG "x25_receive_data(): unknown frame type %2x\n",frametype);
 
        return 0;
 }
index 24fdf4d479174c784b46ed6b99d965341ff9c6ed..57a52d581affada5baee11e1dfcd7b2145485ef1 100644 (file)
@@ -15,6 +15,7 @@
  *     History
  *     X.25 001        Jonathan Naylor Started coding.
  *     X.25 002        Jonathan Naylor New timer architecture.
+ *      2000-09-04     Henner Eisen    Prevented x25_output() skb leakage.
  */
 
 #include <linux/config.h>
@@ -56,7 +57,7 @@ static int x25_pacsize_to_bytes(unsigned int pacsize)
 /*
  *     This is where all X.25 information frames pass;
  */
-void x25_output(struct sock *sk, struct sk_buff *skb)
+int x25_output(struct sock *sk, struct sk_buff *skb)
 {
        struct sk_buff *skbn;
        unsigned char header[X25_EXT_MIN_LEN];
@@ -73,9 +74,12 @@ void x25_output(struct sock *sk, struct sk_buff *skb)
                frontlen = skb_headroom(skb);
 
                while (skb->len > 0) {
-                       if ((skbn = sock_alloc_send_skb(sk, frontlen + max_len, 0, 0, &err)) == NULL)
-                               return;
-
+                       if ((skbn = sock_alloc_send_skb(sk, frontlen + max_len, 0, 0, &err)) == NULL){
+                               int unsent = skb->len - header_len;
+                               SOCK_DEBUG(sk, "x25_output: fragment allocation failed, err=%d, %d bytes unsent\n", err, unsent); 
+                               return err;
+                               }
+                               
                        skb_reserve(skbn, frontlen);
 
                        len = (max_len > skb->len) ? skb->len : max_len;
@@ -102,6 +106,7 @@ void x25_output(struct sock *sk, struct sk_buff *skb)
        } else {
                skb_queue_tail(&sk->write_queue, skb);
        }
+       return 0;
 }
 
 /* 
index cb62dce5dcb1edca292d274cfc56d6d661ec6e11..4db6190e027a93fb8c1be281ffebc287fd948c24 100644 (file)
@@ -285,6 +285,7 @@ void use_config(const char * name, int len)
  * The state machine looks for (approximately) these Perl regular expressions:
  *
  *    m|\/\*.*?\*\/|
+ *    m|\/\/.*|
  *    m|'.*?'|
  *    m|".*?"|
  *    m|#\s*include\s*"(.*?)"|
@@ -319,9 +320,18 @@ __start:
        CASE('_',  underscore);
        goto start;
 
+/* // */
+slash_slash:
+       GETNEXT
+       CASE('\n', start);
+       NOTCASE('\\', slash_slash);
+       GETNEXT
+       goto slash_slash;
+
 /* / */
 slash:
        GETNEXT
+       CASE('/',  slash_slash);
        NOTCASE('*', __start);
 slash_star_dot_star:
        GETNEXT