Skip to content

Remove devfsadm.h and gfx_private.h since they are provided by illumos #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mtelka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove devfsadm.h and gfx_private.h since they are provided by illumos #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
260 changes: 0 additions & 260 deletions usr/src/cmd/devfsadm/devfsadm.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion usr/src/uts/common/drm/drm_sunmod.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ typedef struct drm_instance_state {
drm_device_t *mis_devp;
ddi_acc_handle_t mis_cfg_hdl;
agp_master_softc_t *mis_agpm; /* agpmaster softstate ptr */
gfxp_vgatext_softc_ptr_t mis_gfxp; /* gfx softstate */
gfxp_fb_softc_ptr_t mis_gfxp; /* gfx softstate */
} drm_inst_state_t;


Expand Down
4 changes: 2 additions & 2 deletions usr/src/uts/common/io/drm/drm_sunmod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,7 +692,7 @@ drm_sun_ioctl(dev_t dev_id, int cmd, intptr_t arg, int mode, cred_t *credp,
}

if (DRM_MINOR_IS_VGATEXT(minor_id))
return (gfxp_vgatext_ioctl(dev_id, cmd, arg, mode, credp,
return (gfxp_fb_ioctl(dev_id, cmd, arg, mode, credp,
rvalp, minor->private));

if (DRM_MINOR_IS_AGPMASTER(minor_id))
Expand Down Expand Up @@ -726,7 +726,7 @@ drm_sun_devmap(dev_t dev_id, devmap_cookie_t dhp, offset_t offset,
dev = minor->dev;

if (DRM_MINOR_IS_VGATEXT(minor_id))
return (gfxp_vgatext_devmap(dev_id, dhp, offset, len,
return (gfxp_fb_devmap(dev_id, dhp, offset, len,
maplen, model, minor->private));

if (DRM_MINOR_IS_AGPMASTER(minor_id))
Expand Down
10 changes: 5 additions & 5 deletions usr/src/uts/common/io/drm/drm_sysfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
int drm_sysfs_device_add(struct drm_minor *minor)
{
struct drm_device *dev = minor->dev;
gfxp_vgatext_softc_ptr_t gfxp;
gfxp_fb_softc_ptr_t gfxp;
int ret;

switch (minor->type) {
Expand All @@ -75,8 +75,8 @@ int drm_sysfs_device_add(struct drm_minor *minor)

case DRM_MINOR_VGATEXT:
/* Generic graphics initialization */
gfxp = gfxp_vgatext_softc_alloc();
ret = gfxp_vgatext_attach(dev->devinfo, DDI_ATTACH, gfxp);
gfxp = gfxp_fb_softc_alloc();
ret = gfxp_fb_attach(dev->devinfo, DDI_ATTACH, gfxp);
if (ret != DDI_SUCCESS) {
DRM_ERROR("gfxp_vgatext_attach failed");
return (EFAULT);
Expand Down Expand Up @@ -126,9 +126,9 @@ void drm_sysfs_device_remove(struct drm_minor *minor)

case DRM_MINOR_VGATEXT:
if (minor->private) {
(void) gfxp_vgatext_detach(minor->dev->devinfo,
(void) gfxp_fb_detach(minor->dev->devinfo,
DDI_DETACH, minor->private);
gfxp_vgatext_softc_free(minor->private);
gfxp_fb_softc_free(minor->private);
minor->private = NULL;
}
/* FALLTHROUGH */
Expand Down
3 changes: 1 addition & 2 deletions usr/src/uts/common/sys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ i386_HDRS= \
agp/agpgart_impl.h \
agp/agpmaster_io.h \
agp/agptarget_io.h \
agpgart.h \
gfx_private.h
agpgart.h

sparc_HDRS=

Expand Down
Loading