diff options
| author | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-01-02 13:17:21 +0600 |
|---|---|---|
| committer | Mikhail Gusarov <dottedmag@dottedmag.net> | 2010-01-06 19:47:53 +0600 |
| commit | 62883b499b72f678ab055de4d0370227ae441370 (patch) | |
| tree | 41d8c69aa2501995d7db1458f009f402892d0ad2 | |
| parent | 6c2b3a4247d10a50699ffa6abb643c5e959eefa8 (diff) | |
kdrive: Remove unused KdCardAttr from KdCardInfo
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>
| -rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 6 | ||||
| -rw-r--r-- | hw/kdrive/fake/fakeinit.c | 4 | ||||
| -rw-r--r-- | hw/kdrive/fbdev/fbinit.c | 4 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.h | 20 | ||||
| -rw-r--r-- | hw/kdrive/src/kinfo.c | 2 |
5 files changed, 3 insertions, 33 deletions
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 6db6e7547..c7bfb5bec 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -50,12 +50,8 @@ void processScreenArg (char *screen_size, char *parent_id) ; void InitCard (char *name) { - KdCardAttr attr; - EPHYR_DBG("mark"); - - - KdCardInfoAdd (&ephyrFuncs, &attr, 0); + KdCardInfoAdd (&ephyrFuncs, 0); } void diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c index 0472a7183..87c221d37 100644 --- a/hw/kdrive/fake/fakeinit.c +++ b/hw/kdrive/fake/fakeinit.c @@ -28,9 +28,7 @@ void InitCard (char *name) { - KdCardAttr attr; - - KdCardInfoAdd (&fakeFuncs, &attr, 0); + KdCardInfoAdd (&fakeFuncs, 0); } void diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c index 77d66f4ff..93646f6d7 100644 --- a/hw/kdrive/fbdev/fbinit.c +++ b/hw/kdrive/fbdev/fbinit.c @@ -28,9 +28,7 @@ void InitCard (char *name) { - KdCardAttr attr; - - KdCardInfoAdd (&fbdevFuncs, &attr, 0); + KdCardInfoAdd (&fbdevFuncs, 0); } void diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index b327aa1b2..185995db4 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -63,28 +63,9 @@ #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 { struct _KdCardFuncs *cfuncs; void *closure; - KdCardAttr attr; void *driver; struct _KdScreenInfo *screenList; int selected; @@ -526,7 +507,6 @@ KdBacktrace (int signum); /* kinfo.c */ KdCardInfo * KdCardInfoAdd (KdCardFuncs *funcs, - KdCardAttr *attr, void *closure); KdCardInfo * diff --git a/hw/kdrive/src/kinfo.c b/hw/kdrive/src/kinfo.c index 95afc7963..0825ee24f 100644 --- a/hw/kdrive/src/kinfo.c +++ b/hw/kdrive/src/kinfo.c @@ -29,7 +29,6 @@ KdCardInfo *kdCardInfo; KdCardInfo * KdCardInfoAdd (KdCardFuncs *funcs, - KdCardAttr *attr, void *closure) { KdCardInfo *ci, **prev; @@ -40,7 +39,6 @@ KdCardInfoAdd (KdCardFuncs *funcs, for (prev = &kdCardInfo; *prev; prev = &(*prev)->next); *prev = ci; ci->cfuncs = funcs; - ci->attr = *attr; ci->closure = closure; ci->screenList = 0; ci->selected = 0; |