Prechádzať zdrojové kódy

msm: audio: change uapi include header files directory

Change the directory structure of uapi headers. The existing
directory structure overwrites kernel headers in /usr/include/sound
and /usr/include/linux. Hence move audio uapi headers to
/usr/include/audio folder.

Change-Id: I14ef211a65605e798174087a3f322c64768fbfc7
Signed-off-by: Vignesh Kulothungan <[email protected]>
Vignesh Kulothungan 5 rokov pred
rodič
commit
a97bd5f855
35 zmenil súbory, kde vykonal 2 pridanie a 43 odobranie
  1. 2 3
      Makefile
  2. 0 2
      include/Kbuild
  3. 0 6
      include/uapi/Kbuild
  4. 0 0
      include/uapi/audio/linux/avtimer.h
  5. 0 0
      include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h
  6. 0 0
      include/uapi/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h
  7. 0 0
      include/uapi/audio/linux/msm_audio.h
  8. 0 0
      include/uapi/audio/linux/msm_audio_aac.h
  9. 0 0
      include/uapi/audio/linux/msm_audio_ac3.h
  10. 0 0
      include/uapi/audio/linux/msm_audio_alac.h
  11. 0 0
      include/uapi/audio/linux/msm_audio_amrnb.h
  12. 0 0
      include/uapi/audio/linux/msm_audio_amrwb.h
  13. 0 0
      include/uapi/audio/linux/msm_audio_amrwbplus.h
  14. 0 0
      include/uapi/audio/linux/msm_audio_ape.h
  15. 0 0
      include/uapi/audio/linux/msm_audio_calibration.h
  16. 0 0
      include/uapi/audio/linux/msm_audio_g711.h
  17. 0 0
      include/uapi/audio/linux/msm_audio_g711_dec.h
  18. 0 0
      include/uapi/audio/linux/msm_audio_mvs.h
  19. 0 0
      include/uapi/audio/linux/msm_audio_qcp.h
  20. 0 0
      include/uapi/audio/linux/msm_audio_sbc.h
  21. 0 0
      include/uapi/audio/linux/msm_audio_voicememo.h
  22. 0 0
      include/uapi/audio/linux/msm_audio_wma.h
  23. 0 0
      include/uapi/audio/linux/msm_audio_wmapro.h
  24. 0 0
      include/uapi/audio/linux/wcd-spi-ac-params.h
  25. 0 0
      include/uapi/audio/sound/audio_effects.h
  26. 0 0
      include/uapi/audio/sound/audio_slimslave.h
  27. 0 0
      include/uapi/audio/sound/devdep_params.h
  28. 0 0
      include/uapi/audio/sound/lsm_params.h
  29. 0 0
      include/uapi/audio/sound/msmcal-hwdep.h
  30. 0 0
      include/uapi/audio/sound/voice_params.h
  31. 0 0
      include/uapi/audio/sound/wcd-dsp-glink.h
  32. 0 21
      include/uapi/linux/Kbuild
  33. 0 1
      include/uapi/linux/mfd/Kbuild
  34. 0 2
      include/uapi/linux/mfd/wcd9xxx/Kbuild
  35. 0 8
      include/uapi/sound/Kbuild

+ 2 - 3
Makefile

@@ -17,13 +17,12 @@ endif
 
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE     += \
-                -I$(srctree)/techpack/audio/include/uapi \
-                -I$(srctree)/techpack/audio/include
+                -I$(srctree)/techpack/audio/include/uapi/audio
 
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    += \
-                -I$(srctree)/techpack/audio/include/uapi \
+                -I$(srctree)/techpack/audio/include/uapi/audio \
                 -I$(srctree)/techpack/audio/include
 
 ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)

+ 0 - 2
include/Kbuild

@@ -1,2 +0,0 @@
-# Top-level Makefile calls into asm-$(ARCH)
-# List only non-arch directories below

+ 0 - 6
include/uapi/Kbuild

@@ -1,6 +0,0 @@
-# UAPI Header export list
-# Top-level Makefile calls into asm-$(ARCH)
-# List only non-arch directories below
-
-header-y += linux/
-header-y += sound/

+ 0 - 0
include/uapi/linux/avtimer.h → include/uapi/audio/linux/avtimer.h


+ 0 - 0
include/uapi/linux/mfd/wcd9xxx/wcd9320_registers.h → include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h


+ 0 - 0
include/uapi/linux/mfd/wcd9xxx/wcd9xxx_registers.h → include/uapi/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h


+ 0 - 0
include/uapi/linux/msm_audio.h → include/uapi/audio/linux/msm_audio.h


+ 0 - 0
include/uapi/linux/msm_audio_aac.h → include/uapi/audio/linux/msm_audio_aac.h


+ 0 - 0
include/uapi/linux/msm_audio_ac3.h → include/uapi/audio/linux/msm_audio_ac3.h


+ 0 - 0
include/uapi/linux/msm_audio_alac.h → include/uapi/audio/linux/msm_audio_alac.h


+ 0 - 0
include/uapi/linux/msm_audio_amrnb.h → include/uapi/audio/linux/msm_audio_amrnb.h


+ 0 - 0
include/uapi/linux/msm_audio_amrwb.h → include/uapi/audio/linux/msm_audio_amrwb.h


+ 0 - 0
include/uapi/linux/msm_audio_amrwbplus.h → include/uapi/audio/linux/msm_audio_amrwbplus.h


+ 0 - 0
include/uapi/linux/msm_audio_ape.h → include/uapi/audio/linux/msm_audio_ape.h


+ 0 - 0
include/uapi/linux/msm_audio_calibration.h → include/uapi/audio/linux/msm_audio_calibration.h


+ 0 - 0
include/uapi/linux/msm_audio_g711.h → include/uapi/audio/linux/msm_audio_g711.h


+ 0 - 0
include/uapi/linux/msm_audio_g711_dec.h → include/uapi/audio/linux/msm_audio_g711_dec.h


+ 0 - 0
include/uapi/linux/msm_audio_mvs.h → include/uapi/audio/linux/msm_audio_mvs.h


+ 0 - 0
include/uapi/linux/msm_audio_qcp.h → include/uapi/audio/linux/msm_audio_qcp.h


+ 0 - 0
include/uapi/linux/msm_audio_sbc.h → include/uapi/audio/linux/msm_audio_sbc.h


+ 0 - 0
include/uapi/linux/msm_audio_voicememo.h → include/uapi/audio/linux/msm_audio_voicememo.h


+ 0 - 0
include/uapi/linux/msm_audio_wma.h → include/uapi/audio/linux/msm_audio_wma.h


+ 0 - 0
include/uapi/linux/msm_audio_wmapro.h → include/uapi/audio/linux/msm_audio_wmapro.h


+ 0 - 0
include/uapi/linux/wcd-spi-ac-params.h → include/uapi/audio/linux/wcd-spi-ac-params.h


+ 0 - 0
include/uapi/sound/audio_effects.h → include/uapi/audio/sound/audio_effects.h


+ 0 - 0
include/uapi/sound/audio_slimslave.h → include/uapi/audio/sound/audio_slimslave.h


+ 0 - 0
include/uapi/sound/devdep_params.h → include/uapi/audio/sound/devdep_params.h


+ 0 - 0
include/uapi/sound/lsm_params.h → include/uapi/audio/sound/lsm_params.h


+ 0 - 0
include/uapi/sound/msmcal-hwdep.h → include/uapi/audio/sound/msmcal-hwdep.h


+ 0 - 0
include/uapi/sound/voice_params.h → include/uapi/audio/sound/voice_params.h


+ 0 - 0
include/uapi/sound/wcd-dsp-glink.h → include/uapi/audio/sound/wcd-dsp-glink.h


+ 0 - 21
include/uapi/linux/Kbuild

@@ -1,21 +0,0 @@
-# UAPI Header export list
-header-y += avtimer.h
-header-y += msm_audio.h
-header-y += msm_audio_aac.h
-header-y += msm_audio_ac3.h
-header-y += msm_audio_amrnb.h
-header-y += msm_audio_amrwb.h
-header-y += msm_audio_amrwbplus.h
-header-y += msm_audio_calibration.h
-header-y += msm_audio_mvs.h
-header-y += msm_audio_qcp.h
-header-y += msm_audio_sbc.h
-header-y += msm_audio_voicememo.h
-header-y += msm_audio_wma.h
-header-y += msm_audio_wmapro.h
-header-y += msm_audio_alac.h
-header-y += msm_audio_ape.h
-header-y += msm_audio_g711.h
-header-y += msm_audio_g711_dec.h
-header-y += mfd/
-header-y += wcd-spi-ac-params.h

+ 0 - 1
include/uapi/linux/mfd/Kbuild

@@ -1 +0,0 @@
-header-y += wcd9xxx/

+ 0 - 2
include/uapi/linux/mfd/wcd9xxx/Kbuild

@@ -1,2 +0,0 @@
-header-y += wcd9xxx_registers.h
-header-y += wcd9320_registers.h

+ 0 - 8
include/uapi/sound/Kbuild

@@ -1,8 +0,0 @@
-# UAPI Header export list
-header-y += lsm_params.h
-header-y += audio_slimslave.h
-header-y += audio_effects.h
-header-y += devdep_params.h
-header-y += msmcal-hwdep.h
-header-y += wcd-dsp-glink.h
-header-y += voice_params.h