Bug #9629: Remove badly-licensed neomagic kdrive files.
Licensing issues of these files include: - They claim to be licensed under the GPL, yet we haven't allowed that in the xserver repository in the past. - They refer the user to the top of the tree for GPL license text, yet it isn't there. - They claim to be derived from the (MIT-licensed) ati kdrive code, yet don't follow the licensing terms of those files.
This commit is contained in:
parent
adf46b57ce
commit
87295b66a9
|
@ -1,5 +1,5 @@
|
|||
if KDRIVEVESA
|
||||
VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
|
||||
VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
|
||||
smi via
|
||||
endif
|
||||
|
||||
|
|
|
@ -1,86 +0,0 @@
|
|||
/*
|
||||
* Generic card driving functions.
|
||||
* Essentially, cascades calls to fbdev and vesa to initialize cards that
|
||||
* do not have hardware-specific routines yet. Copied from the ati driver.
|
||||
*
|
||||
* Copyright (c) 2004 Brent Cook <busterb@mail.utexas.edu>
|
||||
*
|
||||
* This code is licensed under the GPL. See the file COPYING in the root
|
||||
* directory of the sources for details.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <kdrive-config.h>
|
||||
#endif
|
||||
#include "backend.h"
|
||||
|
||||
Bool
|
||||
backendInitialize(KdCardInfo *card, BackendInfo *backend)
|
||||
{
|
||||
Bool success = FALSE;
|
||||
|
||||
#ifdef KDRIVEVESA
|
||||
if (!success && vesaInitialize(card, &backend->priv.vesa)) {
|
||||
success = TRUE;
|
||||
backend->type = VESA;
|
||||
backend->cardfini = vesaCardFini;
|
||||
backend->scrfini = vesaScreenFini;
|
||||
backend->initScreen = vesaInitScreen;
|
||||
backend->finishInitScreen = vesaFinishInitScreen;
|
||||
backend->createRes = vesaCreateResources;
|
||||
backend->preserve = vesaPreserve;
|
||||
backend->restore = vesaRestore;
|
||||
backend->dpms = vesaDPMS;
|
||||
backend->enable = vesaEnable;
|
||||
backend->disable = vesaDisable;
|
||||
backend->getColors = vesaGetColors;
|
||||
backend->putColors = vesaPutColors;
|
||||
}
|
||||
#endif
|
||||
#ifdef KDRIVEFBDEV
|
||||
if (!success && fbdevInitialize(card, &backend->priv.fbdev)) {
|
||||
success = TRUE;
|
||||
backend->type = FBDEV;
|
||||
backend->cardfini = fbdevCardFini;
|
||||
backend->scrfini = fbdevScreenFini;
|
||||
backend->initScreen = fbdevInitScreen;
|
||||
backend->finishInitScreen = fbdevFinishInitScreen;
|
||||
backend->createRes = fbdevCreateResources;
|
||||
backend->preserve = fbdevPreserve;
|
||||
backend->restore = fbdevRestore;
|
||||
backend->dpms = fbdevDPMS;
|
||||
backend->enable = fbdevEnable;
|
||||
backend->disable = fbdevDisable;
|
||||
backend->getColors = fbdevGetColors;
|
||||
backend->putColors = fbdevPutColors;
|
||||
}
|
||||
#endif
|
||||
return success;
|
||||
}
|
||||
|
||||
Bool
|
||||
backendScreenInitialize(KdScreenInfo *screen, BackendScreen *backendScreen,
|
||||
BackendInfo *backendCard)
|
||||
{
|
||||
Bool success = FALSE;
|
||||
|
||||
#ifdef KDRIVEFBDEV
|
||||
if (backendCard->type == FBDEV) {
|
||||
screen->card->driver = &backendCard->priv.fbdev;
|
||||
success = fbdevScreenInitialize(screen, &backendScreen->fbdev);
|
||||
screen->memory_size = backendCard->priv.fbdev.fix.smem_len;
|
||||
screen->off_screen_base = backendCard->priv.fbdev.var.yres_virtual
|
||||
* screen->fb[0].byteStride;
|
||||
}
|
||||
#endif
|
||||
#ifdef KDRIVEVESA
|
||||
if (backendCard->type == VESA) {
|
||||
screen->card->driver = &backendCard->priv.vesa;
|
||||
if (screen->fb[0].depth == 0) {
|
||||
screen->fb[0].depth = 16;
|
||||
}
|
||||
success = vesaScreenInitialize(screen, &backendScreen->vesa);
|
||||
}
|
||||
#endif
|
||||
return success;
|
||||
}
|
|
@ -1,70 +0,0 @@
|
|||
/*
|
||||
* Generic card driving functions.
|
||||
* Essentially, cascades calls to fbdev and vesa to initialize cards that
|
||||
* do not have hardware-specific routines yet. Copied from the ati driver.
|
||||
*
|
||||
* Copyright (c) 2004 Brent Cook <busterb@mail.utexas.edu>
|
||||
*
|
||||
* This code is licensed under the GPL. See the file COPYING in the root
|
||||
* directory of the sources for details.
|
||||
*/
|
||||
|
||||
#ifndef _BACKEND_H_
|
||||
#define _BACKEND_H_
|
||||
#include "kdrive.h"
|
||||
|
||||
#ifdef KDRIVEFBDEV
|
||||
#include <fbdev.h>
|
||||
#endif
|
||||
#ifdef KDRIVEVESA
|
||||
#include <vesa.h>
|
||||
#endif
|
||||
|
||||
typedef enum _BackendType {VESA, FBDEV} BackendType;
|
||||
|
||||
typedef struct _BackendInfo {
|
||||
// backend info
|
||||
BackendType type;
|
||||
|
||||
// backend internal structures
|
||||
union {
|
||||
#ifdef KDRIVEFBDEV
|
||||
FbdevPriv fbdev;
|
||||
#endif
|
||||
#ifdef KDRIVEVESA
|
||||
VesaCardPrivRec vesa;
|
||||
#endif
|
||||
} priv;
|
||||
|
||||
// pointers to helper functions for this backend
|
||||
void (*cardfini)(KdCardInfo *);
|
||||
void (*scrfini)(KdScreenInfo *);
|
||||
Bool (*initScreen)(ScreenPtr);
|
||||
Bool (*finishInitScreen)(ScreenPtr pScreen);
|
||||
Bool (*createRes)(ScreenPtr);
|
||||
void (*preserve)(KdCardInfo *);
|
||||
void (*restore)(KdCardInfo *);
|
||||
Bool (*dpms)(ScreenPtr, int);
|
||||
Bool (*enable)(ScreenPtr);
|
||||
void (*disable)(ScreenPtr);
|
||||
void (*getColors)(ScreenPtr, int, int, xColorItem *);
|
||||
void (*putColors)(ScreenPtr, int, int, xColorItem *);
|
||||
} BackendInfo;
|
||||
|
||||
typedef union _BackendScreen {
|
||||
#ifdef KDRIVEFBDEV
|
||||
FbdevScrPriv fbdev;
|
||||
#endif
|
||||
#ifdef KDRIVEVESA
|
||||
VesaScreenPrivRec vesa;
|
||||
#endif
|
||||
} BackendScreen;
|
||||
|
||||
Bool
|
||||
backendInitialize(KdCardInfo *card, BackendInfo *backend);
|
||||
|
||||
Bool
|
||||
backendScreenInitialize(KdScreenInfo *screen, BackendScreen *backendScreen,
|
||||
BackendInfo *backendCard);
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user