Attachment 14699 Details for Bug 14739 – 0001-Export-symbols-used-by-different-cirrus-driver-modul.patch

[patch] 0001-Export-symbols-used-by-different-cirrus-driver-modul.patch

0001-Export-symbols-used-by-different-cirrus-driver-modul.patch (text/plain), 6.10 KB, created by Paulo César Pereira de Andrade on 2008-02-28 22:19:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-02-28 22:19:52 UTC

Size: 6.10 KB

patch

obsolete

>From d50ebb667acb7ea50a0757cb2c807c1bc7918b2d Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com>
>Date: Thu, 31 Jan 2008 23:47:48 -0200
>Subject: [PATCH] Export symbols used by different cirrus driver modules.
>
>Symbols are used by cirrus_drv.so, cirrus_alpine.so, and cirrus_laguna.so.
>
>These must have public visibility if compiling with hidden symbols.
>---
> src/CirrusClk.c  |    2 +-
> src/alp.h        |    4 ++--
> src/cir.h        |   24 ++++++++++++------------
> src/cir_dga.c    |    2 +-
> src/cir_driver.c |    8 ++++----
> src/cir_shadow.c |   12 ++++++------
> src/lg.h         |    4 ++--
> 7 files changed, 28 insertions(+), 28 deletions(-)
>
>diff --git a/src/CirrusClk.c b/src/CirrusClk.c
>index f23fde8..a3590c9 100644
>--- a/src/CirrusClk.c
>+++ b/src/CirrusClk.c
>@@ -88,7 +88,7 @@ static cirrusClockRec cirrusClockTab[] = {
>  * use the tested clock since others can be unstable.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> CirrusFindClock(int *rfreq, int max_clock, int *num_out, int *den_out)
> {
> 	int n, i;
>diff --git a/src/alp.h b/src/alp.h
>index 01c5301..a60829a 100644
>--- a/src/alp.h
>+++ b/src/alp.h
>@@ -5,8 +5,8 @@
> #ifndef ALP_H
> #define ALP_H
> 
>-extern ScrnInfoPtr AlpProbe(int entity);
>-extern const OptionInfoRec *	AlpAvailableOptions(int chipid);
>+_X_EXPORT ScrnInfoPtr AlpProbe(int entity);
>+_X_EXPORT const OptionInfoRec *	AlpAvailableOptions(int chipid);
> 
> # ifdef _ALP_PRIVATE_
> /* Saved registers that are not part of the core VGA */
>diff --git a/src/cir.h b/src/cir.h
>index 904d9cc..205c4d1 100644
>--- a/src/cir.h
>+++ b/src/cir.h
>@@ -72,27 +72,27 @@ typedef struct {
> } CirRec, *CirPtr;
> 
> /* CirrusClk.c */
>-extern Bool
>+_X_EXPORT Bool
> CirrusFindClock(int *rfreq, int max_clock, int *num_out, int *den_out);
> 
> /* cir_driver.c */
> extern SymTabRec CIRChipsets[];
>-extern PciChipsets CIRPciChipsets[];
>+extern _X_EXPORT PciChipsets CIRPciChipsets[];
> 
>-extern Bool CirMapMem(CirPtr pCir, int scrnIndex);
>-extern Bool CirUnmapMem(CirPtr pCir, int scrnIndex);
>-extern void cirProbeDDC(ScrnInfoPtr pScrn, int index);
>+_X_EXPORT Bool CirMapMem(CirPtr pCir, int scrnIndex);
>+_X_EXPORT Bool CirUnmapMem(CirPtr pCir, int scrnIndex);
>+_X_EXPORT void cirProbeDDC(ScrnInfoPtr pScrn, int index);
> 
> /* cir_dga.c */
>-extern Bool CirDGAInit(ScreenPtr pScreen);
>+_X_EXPORT Bool CirDGAInit(ScreenPtr pScreen);
> 
> /* in cir_shadow.c */
>-void cirPointerMoved(int index, int x, int y);
>-void cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>-void cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>-void cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>-void cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>-void cirRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>+_X_EXPORT void cirPointerMoved(int index, int x, int y);
>+_X_EXPORT void cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>+_X_EXPORT void cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>+_X_EXPORT void cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>+_X_EXPORT void cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
>+_X_EXPORT void cirRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
> 
> /* properties */
> #define HWCUR64 0x1
>diff --git a/src/cir_dga.c b/src/cir_dga.c
>index bedb796..bc98df6 100644
>--- a/src/cir_dga.c
>+++ b/src/cir_dga.c
>@@ -67,7 +67,7 @@ DGAFunctionRec CirDGAFuncs = {
> 
> 
> 
>-Bool
>+_X_EXPORT Bool
> CirDGAInit(ScreenPtr pScreen)
> {
>   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
>diff --git a/src/cir_driver.c b/src/cir_driver.c
>index 1942b15..0ce058d 100644
>--- a/src/cir_driver.c
>+++ b/src/cir_driver.c
>@@ -93,7 +93,7 @@ SymTabRec CIRChipsets[] = {
> };
> 
> /* List of PCI chipset names */
>-PciChipsets CIRPciChipsets[] = {
>+_X_EXPORT PciChipsets CIRPciChipsets[] = {
> 	{ PCI_CHIP_GD5430,	PCI_CHIP_GD5430,	RES_SHARED_VGA },
> 	{ PCI_CHIP_GD5434_4,PCI_CHIP_GD5434_4,	RES_SHARED_VGA },
> 	{ PCI_CHIP_GD5434_8,PCI_CHIP_GD5434_8,	RES_SHARED_VGA },
>@@ -320,7 +320,7 @@ CIRProbe(DriverPtr drv, int flags)
>  * Map the framebuffer and MMIO memory.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> CirMapMem(CirPtr pCir, int scrnIndex)
> {
> 	int mmioFlags;
>@@ -410,7 +410,7 @@ CirMapMem(CirPtr pCir, int scrnIndex)
>  * Unmap the framebuffer and MMIO memory.
>  */
> 
>-Bool
>+_X_EXPORT Bool
> CirUnmapMem(CirPtr pCir, int scrnIndex)
> {
> #ifdef CIR_DEBUG
>@@ -438,7 +438,7 @@ CirUnmapMem(CirPtr pCir, int scrnIndex)
> 	return TRUE;
> }
> 
>-void
>+_X_EXPORT void
> cirProbeDDC(ScrnInfoPtr pScrn, int index)
> {
>     vbeInfoPtr pVbe;
>diff --git a/src/cir_shadow.c b/src/cir_shadow.c
>index a7964cd..e8b8d35 100644
>--- a/src/cir_shadow.c
>+++ b/src/cir_shadow.c
>@@ -19,7 +19,7 @@
> #include "cir.h"
> #include "alp.h"
> 
>-void
>+_X_EXPORT void
> cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
> {
>     CirPtr pCir = CIRPTR(pScrn);
>@@ -46,7 +46,7 @@ cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
>     }
> } 
> 
>-void
>+_X_EXPORT void
> cirPointerMoved(int index, int x, int y)
> {
>     ScrnInfoPtr pScrn = xf86Screens[index];
>@@ -64,7 +64,7 @@ cirPointerMoved(int index, int x, int y)
>     (*pCir->PointerMoved)(index, newX, newY);
> }
> 
>-void
>+_X_EXPORT void
> cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
> {
>     CirPtr pCir = CIRPTR(pScrn);
>@@ -110,7 +110,7 @@ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
> } 
> 
> 
>-void
>+_X_EXPORT void
> cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
> {
>     CirPtr pCir = CIRPTR(pScrn);
>@@ -157,7 +157,7 @@ cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
> 
> 
> /* this one could be faster */
>-void
>+_X_EXPORT void
> cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
> {
>     CirPtr pCir = CIRPTR(pScrn);
>@@ -208,7 +208,7 @@ cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
>     }
> }
> 
>-void
>+_X_EXPORT void
> cirRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
> {
>     CirPtr pCir = CIRPTR(pScrn);
>diff --git a/src/lg.h b/src/lg.h
>index 9d91053..ec66f1a 100644
>--- a/src/lg.h
>+++ b/src/lg.h
>@@ -16,8 +16,8 @@
> #define LG_H
> #define LG_DEBUG
> 
>-extern ScrnInfoPtr LgProbe(int entity);
>-extern const OptionInfoRec *	LgAvailableOptions(int chipid);
>+_X_EXPORT ScrnInfoPtr LgProbe(int entity);
>+_X_EXPORT const OptionInfoRec *	LgAvailableOptions(int chipid);
> 
> # ifdef _LG_PRIVATE_
> 
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 14739: 14699 | 14943 | 17753

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.