Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1365007 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] oxygen: add symbol for I/O space size 



Remove another magic number - add a symbol for the size of the PCI I/O
range.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent d023dc0a

sound/pci/oxygen/oxygen.h

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#define PCM_AC97	5

#define PCM_COUNT	6



#define OXYGEN_IO_SIZE	0x100



/* model-specific configuration of outputs/inputs */

#define PLAYBACK_0_TO_I2S	0x001

#define PLAYBACK_1_TO_SPDIF	0x004

sound/pci/oxygen/oxygen_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void oxygen_proc_read(struct snd_info_entry *entry, 
	int i, j;



	snd_iprintf(buffer, "CMI8788\n\n");

	for (i = 0; i < 0x100; i += 0x10) {

	for (i = 0; i < OXYGEN_IO_SIZE; i += 0x10) {

		snd_iprintf(buffer, "%02x:", i);

		for (j = 0; j < 0x10; ++j)

			snd_iprintf(buffer, " %02x", oxygen_read8(chip, i + j));
@@ -455,7 +455,7 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, 
	}



	if (!(pci_resource_flags(pci, 0) & IORESOURCE_IO) ||

	    pci_resource_len(pci, 0) < 0x100) {

	    pci_resource_len(pci, 0) < OXYGEN_IO_SIZE) {

		snd_printk(KERN_ERR "invalid PCI I/O range\n");

		err = -ENXIO;

		goto err_pci_regions;