/[openvortex]/alsa/alsa-kernel/pci/korg1212/korg1212.c
ViewVC logotype

Diff of /alsa/alsa-kernel/pci/korg1212/korg1212.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by vizard, Sat May 31 02:35:12 2003 UTC revision 1.3 by vizard, Mon Aug 11 00:06:40 2003 UTC
# Line 2070  static void snd_korg1212_proc_read(snd_i Line 2070  static void snd_korg1212_proc_read(snd_i
2070          snd_iprintf(buffer, korg1212->card->longname);          snd_iprintf(buffer, korg1212->card->longname);
2071          snd_iprintf(buffer, " (index #%d)\n", korg1212->card->number + 1);          snd_iprintf(buffer, " (index #%d)\n", korg1212->card->number + 1);
2072          snd_iprintf(buffer, "\nGeneral settings\n");          snd_iprintf(buffer, "\nGeneral settings\n");
2073          snd_iprintf(buffer, "    period size: %d bytes\n", K1212_PERIOD_BYTES);          snd_iprintf(buffer, "    period size: %Zd bytes\n", K1212_PERIOD_BYTES);
2074          snd_iprintf(buffer, "     clock mode: %s\n", clockSourceName[korg1212->clkSrcRate] );          snd_iprintf(buffer, "     clock mode: %s\n", clockSourceName[korg1212->clkSrcRate] );
2075          snd_iprintf(buffer, "  left ADC Sens: %d\n", korg1212->leftADCInSens );          snd_iprintf(buffer, "  left ADC Sens: %d\n", korg1212->leftADCInSens );
2076          snd_iprintf(buffer, " right ADC Sens: %d\n", korg1212->rightADCInSens );          snd_iprintf(buffer, " right ADC Sens: %d\n", korg1212->rightADCInSens );
# Line 2336  static int __devinit snd_korg1212_create Line 2336  static int __devinit snd_korg1212_create
2336          korg1212->sharedBufferPhy = (unsigned long)phys_addr;          korg1212->sharedBufferPhy = (unsigned long)phys_addr;
2337    
2338          if (korg1212->sharedBufferPtr == NULL) {          if (korg1212->sharedBufferPtr == NULL) {
2339                  snd_printk(KERN_ERR "can not allocate shared buffer memory (%d bytes)\n", sizeof(KorgSharedBuffer));                  snd_printk(KERN_ERR "can not allocate shared buffer memory (%Zd bytes)\n", sizeof(KorgSharedBuffer));
2340                  return -ENOMEM;                  return -ENOMEM;
2341          }          }
2342    
# Line 2385  static int __devinit snd_korg1212_create Line 2385  static int __devinit snd_korg1212_create
2385    
2386          korg1212->dspCodeSize = sizeof (dspCode);          korg1212->dspCodeSize = sizeof (dspCode);
2387    
2388          korg1212->VolumeTablePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->volumeData;          korg1212->VolumeTablePhy = korg1212->sharedBufferPhy +
2389          korg1212->RoutingTablePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->routeData;                  offsetof(KorgSharedBuffer, volumeData);
2390          korg1212->AdatTimeCodePhy = (u32) &((KorgSharedBuffer *) korg1212->sharedBufferPhy)->AdatTimeCode;          korg1212->RoutingTablePhy = korg1212->sharedBufferPhy +
2391                    offsetof(KorgSharedBuffer, routeData);
2392            korg1212->AdatTimeCodePhy = korg1212->sharedBufferPhy +
2393                    offsetof(KorgSharedBuffer, AdatTimeCode);
2394    
2395          korg1212->dspMemPtr = snd_malloc_pci_pages(korg1212->pci, korg1212->dspCodeSize, &phys_addr);          korg1212->dspMemPtr = snd_malloc_pci_pages(korg1212->pci, korg1212->dspCodeSize, &phys_addr);
2396          korg1212->dspMemPhy = (u32)phys_addr;          korg1212->dspMemPhy = (u32)phys_addr;

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26