Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Xf86 Video Fbturbo
Commits
6bae3476
Commit
6bae3476
authored
Oct 12, 2007
by
Matthias Hopf
Browse files
Fixed leftover PCIACCESS -> XSERVER_LIBPCIACCESS.
parent
a9a7763c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/fbdev.c
View file @
6bae3476
...
...
@@ -34,7 +34,7 @@
#include "xf86xv.h"
#ifdef PCIACCESS
#ifdef
XSERVER_LIB
PCIACCESS
#include <pciaccess.h>
#endif
...
...
@@ -53,7 +53,7 @@ static Bool debug = 0;
static
const
OptionInfoRec
*
FBDevAvailableOptions
(
int
chipid
,
int
busid
);
static
void
FBDevIdentify
(
int
flags
);
static
Bool
FBDevProbe
(
DriverPtr
drv
,
int
flags
);
#ifdef PCIACCESS
#ifdef
XSERVER_LIB
PCIACCESS
static
Bool
FBDevPciProbe
(
DriverPtr
drv
,
int
entity_num
,
struct
pci_device
*
dev
,
intptr_t
match_data
);
#endif
...
...
@@ -84,7 +84,7 @@ static int pix24bpp = 0;
#define FBDEV_NAME "FBDEV"
#define FBDEV_DRIVER_NAME "fbdev"
#ifdef PCIACCESS
#ifdef
XSERVER_LIB
PCIACCESS
static
const
struct
pci_id_match
fbdev_device_match
[]
=
{
{
PCI_MATCH_ANY
,
PCI_MATCH_ANY
,
PCI_MATCH_ANY
,
PCI_MATCH_ANY
,
...
...
@@ -108,7 +108,7 @@ _X_EXPORT DriverRec FBDEV = {
0
,
FBDevDriverFunc
,
#ifdef PCIACCESS
#ifdef
XSERVER_LIB
PCIACCESS
fbdev_device_match
,
FBDevPciProbe
#endif
...
...
@@ -298,7 +298,7 @@ FBDevIdentify(int flags)
}
#ifdef PCIACCESS
#ifdef
XSERVER_LIB
PCIACCESS
static
Bool
FBDevPciProbe
(
DriverPtr
drv
,
int
entity_num
,
struct
pci_device
*
dev
,
intptr_t
match_data
)
{
...
...
@@ -373,13 +373,13 @@ FBDevProbe(DriverPtr drv, int flags)
for
(
i
=
0
;
i
<
numDevSections
;
i
++
)
{
Bool
isIsa
=
FALSE
;
#ifndef PCIACCESS
#ifndef
XSERVER_LIB
PCIACCESS
Bool
isPci
=
FALSE
;
#endif
dev
=
xf86FindOptionValue
(
devSections
[
i
]
->
options
,
"fbdev"
);
if
(
devSections
[
i
]
->
busID
)
{
#ifndef PCIACCESS
#ifndef
XSERVER_LIB
PCIACCESS
if
(
xf86ParsePciBusString
(
devSections
[
i
]
->
busID
,
&
bus
,
&
device
,
&
func
))
{
if
(
!
xf86CheckPciSlot
(
bus
,
device
,
func
))
...
...
@@ -393,7 +393,7 @@ FBDevProbe(DriverPtr drv, int flags)
}
if
(
fbdevHWProbe
(
NULL
,
dev
,
NULL
))
{
pScrn
=
NULL
;
#ifndef PCIACCESS
#ifndef
XSERVER_LIB
PCIACCESS
if
(
isPci
)
{
/* XXX what about when there's no busID set? */
int
entity
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment