andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kdrive: Remove unused KdCardAttr from KdCardInfo

Browse Source 
Card attrs are unused in all current kdrive servers, so
remove it completely to avoid allocating and passing dummy
values to KdCardInfoAdd.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
This commit is contained in:
Mikhail Gusarov 2010-01-02 13:17:21 +06:00
parent 6c2b3a4247
commit 62883b499b
5 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/kdrive/ephyr/ephyrinit.c
View File

@ -50,12 +50,8 @@ void processScreenArg (char *screen_size, char *parent_id) ;
void void
InitCard (char *name) InitCard (char *name)
{ {
KdCardAttr attr;
EPHYR_DBG("mark"); EPHYR_DBG("mark");
KdCardInfoAdd (&ephyrFuncs, 0);
KdCardInfoAdd (&ephyrFuncs, &attr, 0);
} }
void void

4
hw/kdrive/fake/fakeinit.c
View File

@ -28,9 +28,7 @@
void void
InitCard (char *name) InitCard (char *name)
{ {
KdCardAttr attr; KdCardInfoAdd (&fakeFuncs, 0);
KdCardInfoAdd (&fakeFuncs, &attr, 0);
} }
void void

4
hw/kdrive/fbdev/fbinit.c
View File

@ -28,9 +28,7 @@
void void
InitCard (char *name) InitCard (char *name)
{ {
KdCardAttr attr; KdCardInfoAdd (&fbdevFuncs, 0);
KdCardInfoAdd (&fbdevFuncs, &attr, 0);
} }
void void

20
hw/kdrive/src/kdrive.h
View File

@ -63,28 +63,9 @@
#define Status int #define Status int
/*
* Configuration information per video card
*/
typedef struct _KdCardAttr {
CARD32 io;
CARD32 address[KD_MAX_CARD_ADDRESS];
int naddr;
/* PCI bus info */
CARD16 vendorID;
CARD16 deviceID;
CARD8 domain;
CARD8 bus;
CARD8 slot;
CARD8 func;
} KdCardAttr;
typedef struct _KdCardInfo { typedef struct _KdCardInfo {
struct _KdCardFuncs *cfuncs; struct _KdCardFuncs *cfuncs;
void *closure; void *closure;
KdCardAttr attr;
void *driver; void *driver;
struct _KdScreenInfo *screenList; struct _KdScreenInfo *screenList;
int selected; int selected;
@ -526,7 +507,6 @@ KdBacktrace (int signum);
/* kinfo.c */ /* kinfo.c */
KdCardInfo * KdCardInfo *
KdCardInfoAdd (KdCardFuncs *funcs, KdCardInfoAdd (KdCardFuncs *funcs,
KdCardAttr *attr,
void *closure); void *closure);
KdCardInfo * KdCardInfo *

2
hw/kdrive/src/kinfo.c
View File

@ -29,7 +29,6 @@ KdCardInfo *kdCardInfo;
KdCardInfo * KdCardInfo *
KdCardInfoAdd (KdCardFuncs *funcs, KdCardInfoAdd (KdCardFuncs *funcs,
KdCardAttr *attr,
void *closure) void *closure)
{ {
KdCardInfo *ci, **prev; KdCardInfo *ci, **prev;
@ -40,7 +39,6 @@ KdCardInfoAdd (KdCardFuncs *funcs,
for (prev = &kdCardInfo; *prev; prev = &(*prev)->next); for (prev = &kdCardInfo; *prev; prev = &(*prev)->next);
*prev = ci; *prev = ci;
ci->cfuncs = funcs; ci->cfuncs = funcs;
ci->attr = *attr;
ci->closure = closure; ci->closure = closure;
ci->screenList = 0; ci->screenList = 0;
ci->selected = 0; ci->selected = 0;