From 359f758bc40ae970625212ce6bf1a4173163e2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 9 May 2008 12:42:33 +0000 Subject: [PATCH] * Added PCI_hd_audio sub-type in the PCI_multimedia base class. * Fixed some minor typos. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25393 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/drivers/PCI.h | 13 +++++++------ src/add-ons/kernel/drivers/audio/hda/driver.h | 4 +++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/headers/os/drivers/PCI.h b/headers/os/drivers/PCI.h index a54f69a0dc..1ede4c7389 100644 --- a/headers/os/drivers/PCI.h +++ b/headers/os/drivers/PCI.h @@ -326,7 +326,7 @@ struct pci_module_info { #define PCI_vga 0x00 /* VGA controller */ #define PCI_xga 0x01 /* XGA controller */ -#define PCI_3d 0x02 /* £d controller */ +#define PCI_3d 0x02 /* 3d controller */ #define PCI_display_other 0x80 /* other display controller */ @@ -334,10 +334,11 @@ struct pci_module_info { values for the class_sub field for class_base = 0x04 (multimedia device) --- */ -#define PCI_video 0x00 /* video */ -#define PCI_audio 0x01 /* audio */ -#define PCI_telephony 0x02 /* computer telephony device */ -#define PCI_multimedia_other 0x80 /* other multimedia device */ +#define PCI_video 0x00 /* video */ +#define PCI_audio 0x01 /* audio */ +#define PCI_telephony 0x02 /* computer telephony device */ +#define PCI_hd_audio 0x03 /* HD audio */ +#define PCI_multimedia_other 0x80 /* other multimedia device */ /* --- @@ -403,7 +404,7 @@ struct pci_module_info { system peripherals) --- */ -#define PCI_pic 0x00 /* periperal interrupt controller */ +#define PCI_pic 0x00 /* peripheral interrupt controller */ #define PCI_dma 0x01 /* dma controller */ #define PCI_timer 0x02 /* timers */ #define PCI_rtc 0x03 /* real time clock */ diff --git a/src/add-ons/kernel/drivers/audio/hda/driver.h b/src/add-ons/kernel/drivers/audio/hda/driver.h index 0784bbce9f..5486528cf5 100644 --- a/src/add-ons/kernel/drivers/audio/hda/driver.h +++ b/src/add-ons/kernel/drivers/audio/hda/driver.h @@ -30,7 +30,9 @@ #define MAX_CARDS 4 /* values for the class_sub field for class_base = 0x04 (multimedia device) */ -#define PCI_hd_audio 3 +#ifndef __HAIKU__ +# define PCI_hd_audio 3 +#endif #define HDA_MAX_AUDIO_GROUPS 15 #define HDA_MAX_CODECS 15