From: Mark Kettenis <mark.kettenis@xs4all.nl>
To: chris@chris-wilson.co.uk
Cc: intel-gfx@lists.freedesktop.org, mark.kettenis@xs4all.nl
Subject: Re: [PATCH] xf86-video-intel: Unbreak build on OpenBSD
Date: Tue, 18 Feb 2014 19:55:46 +0100 (CET) [thread overview]
Message-ID: <201402181855.s1IItjEZ005579@glazunov.sibelius.xs4all.nl> (raw)
In-Reply-To: <20140218080636.GB11611@nuc-i3427.alporthouse.com> (message from Chris Wilson on Tue, 18 Feb 2014 08:06:36 +0000)
> Date: Tue, 18 Feb 2014 08:06:36 +0000
> From: Chris Wilson <chris@chris-wilson.co.uk>
>
> On Sat, Feb 15, 2014 at 09:29:42PM +0100, Mark Kettenis wrote:
> > Fallout from the backlight helper changes.
>
> Apologies for missing this earlier. I have rearranged the code once
> again to try to push the OpenBSD specifics down into src/backlight.c,
> can you please check what needs to be fixed up now?
No worries.
Here's a new diff against master.
diff --git a/src/backlight.c b/src/backlight.c
index 688819d..3c3f152 100644
--- a/src/backlight.c
+++ b/src/backlight.c
@@ -32,6 +32,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <stdio.h>
#include <stdlib.h>
@@ -71,13 +72,14 @@
#ifdef __OpenBSD__
#include <dev/wscons/wsconsio.h>
+#include <xf86Priv.h>
int backlight_set(struct backlight *b, int level)
{
struct wsdisplay_param param;
if (b->iface == NULL)
- return;
+ return -1;
if ((unsigned)level > b->max)
level = b->max;
@@ -129,6 +131,14 @@ int backlight_open(struct backlight *b, char *iface)
return param.curval;
}
+enum backlight_type backlight_exists(const char *iface)
+{
+ if (iface != NULL)
+ return BL_NONE;
+
+ return BL_PLATFORM;
+}
+
#else
static int
next prev parent reply other threads:[~2014-02-18 18:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-15 20:29 [PATCH] xf86-video-intel: Unbreak build on OpenBSD Mark Kettenis
2014-02-18 8:06 ` Chris Wilson
2014-02-18 18:55 ` Mark Kettenis [this message]
2014-02-18 19:05 ` Chris Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201402181855.s1IItjEZ005579@glazunov.sibelius.xs4all.nl \
--to=mark.kettenis@xs4all.nl \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.