path: root/x11/gnomeapplets2/files/patch-battstat-acpi

--- battstat/acpi-freebsd.h.orig    Mon Sep 27 18:39:30 2004
+++ battstat/acpi-freebsd.h Mon Sep 27 18:39:30 2004
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ACPI_FREEBSD_H__
+#define __ACPI_FREEBSD_H__
+
+#define ACPIDEV "/dev/acpi"
+
+#define BATT_MIN 0
+#define BATT_MAX 64
+
+#define ACPI_ACLINE "hw.acpi.acline"
+#define ACPI_TIME "hw.acpi.battery.time"
+#define ACPI_LIFE "hw.acpi.battery.life"
+#define ACPI_STATE "hw.acpi.battery.state"
+
+struct acpi_info {
+  gboolean  ac_online;
+  int       acpifd;
+  int       max_capacity;
+  int       low_capacity;
+  int       critical_capacity;
+};
+
+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo);
+gboolean acpi_process_event(struct acpi_info * acpiinfo);
+gboolean acpi_freebsd_init(struct acpi_info * acpiinfo);
+void acpi_freebsd_cleanup(struct acpi_info * acpiinfo);
+
+#endif /* __ACPI_FREEBSD_H__ */
--- battstat/acpi-freebsd.c.orig    Tue Sep 28 16:55:52 2004
+++ battstat/acpi-freebsd.c Tue Sep 28 17:00:32 2004
@@ -0,0 +1,213 @@
+/* battstat        A GNOME battery meter for laptops.
+ * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ $Id: patch-battstat-acpi,v 1.6 2005-01-14 05:51:02 marcus Exp $
+ */
+
+/*
+ * ACPI battery functions for FreeBSD >= 5.2.
+ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef __FreeBSD__
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/ioctl.h>
+#include <machine/apm_bios.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <glib.h>
+
+#include <dev/acpica/acpiio.h>
+#include <contrib/dev/acpica/acpi.h>
+
+#include "acpi-freebsd.h"
+
+static gboolean
+update_ac_info(struct acpi_info * acpiinfo)
+{
+  int acline;
+  size_t len = sizeof(acline);
+
+  acpiinfo->ac_online = FALSE;
+
+  if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) {
+    return FALSE;
+  }
+
+  acpiinfo->ac_online = acline ? TRUE : FALSE;
+
+  return TRUE;
+}
+
+static gboolean
+update_battery_info(struct acpi_info * acpiinfo)
+{
+  union acpi_battery_ioctl_arg battio;
+  int i;
+
+  /* We really don't have to do this here.  All of the relevant battery
+   * info can be obtained through sysctl.  However, one day, the rate
+   * may be useful to get time left to full charge.
+   */
+
+  for(i = BATT_MIN; i < BATT_MAX; i++) {
+    battio.unit = i;
+    if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) {
+      continue;
+    }
+
+    acpiinfo->max_capacity += battio.bif.lfcap;
+    acpiinfo->low_capacity += battio.bif.wcap;
+    acpiinfo->critical_capacity += battio.bif.lcap;
+  }
+
+  return TRUE;
+}
+
+gboolean
+acpi_freebsd_init(struct acpi_info * acpiinfo)
+{
+  int acpi_fd;
+
+  g_assert(acpiinfo);
+
+  acpi_fd = open(ACPIDEV, O_RDONLY);
+  if (acpi_fd >= 0) {
+    acpiinfo->acpifd = acpi_fd;
+  }
+  else {
+    acpiinfo->acpifd = -1;
+    return FALSE;
+  }
+
+  update_battery_info(acpiinfo);
+  update_ac_info(acpiinfo);
+
+  return TRUE;
+}
+
+void
+acpi_freebsd_cleanup(struct acpi_info * acpiinfo)
+{
+  g_assert(acpiinfo);
+
+  if (acpiinfo->acpifd >= 0) {
+    close(acpiinfo->acpifd);
+    acpiinfo->acpifd = -1;
+  }
+}
+
+/* XXX This is a hack since user-land applications can't get ACPI events yet.
+ * Devd provides this (or supposedly provides this), but you need to be
+ * root to access devd.
+ */
+gboolean
+acpi_process_event(struct acpi_info * acpiinfo)
+{
+  g_assert(acpiinfo);
+
+  update_ac_info(acpiinfo);
+  update_battery_info(acpiinfo);
+
+  return TRUE;
+}
+
+gboolean
+acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo)
+{
+  int time;
+  int life;
+  int acline;
+  int state;
+  size_t len;
+  int rate;
+  int remain;
+  union acpi_battery_ioctl_arg battio;
+  gboolean charging;
+  int i;
+
+  g_assert(acpiinfo);
+
+  charging = FALSE;
+
+  for(i = BATT_MIN; i < BATT_MAX; i++) {
+    battio.unit = i;
+    if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) {
+      continue;
+    }
+
+    remain += battio.bst.cap;
+    rate += battio.bst.rate;
+  }
+
+  len = sizeof(time);
+  if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) {
+    return FALSE;
+  }
+
+  len = sizeof(life);
+  if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) {
+    return FALSE;
+  }
+
+  len = sizeof(state);
+  if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) {
+    return FALSE;
+  }
+
+  apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0;
+  if (state & ACPI_BATT_STAT_CHARGING) {
+    apminfo->ai_batt_stat = 3;
+    charging = TRUE;
+  }
+  else if (state & ACPI_BATT_STAT_CRITICAL) {
+    /* Add a special check here since FreeBSD's ACPI interface will tell us
+     * when the battery is critical.
+     */
+    apminfo->ai_batt_stat = 2;
+  }
+  else {
+    apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0;
+  }
+  apminfo->ai_batt_life = life;
+  if (!charging) {
+    apminfo->ai_batt_time = time * 60;
+  }
+  else if (charging && rate > 0) {
+    apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60);
+  }
+  else
+    /* This multiplication is a hack to make sure the -1 survives so the applet
+     * can process it.  Battstat wants the remaining time in minutes, but
+     * ai_batt_time is in seconds.  In order to make both ACPI and APM work
+     * with the fewest amount of hacks, we will just assume everything is
+     * in seconds.
+     */
+    apminfo->ai_batt_time = -1 * 60;
+
+  return TRUE;
+}
+#endif
--- battstat/Makefile.in.orig   Thu Jan 13 23:29:04 2005
+++ battstat/Makefile.in    Thu Jan 13 23:31:24 2005
@@ -55,7 +55,7 @@
 PROGRAMS = $(libexec_PROGRAMS)
 am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
    battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \
-   acpi-linux.$(OBJEXT)
+   acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT)
 battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS)
 am__DEPENDENCIES_1 =
 @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 =  \
@@ -66,6 +66,7 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \
+@AMDEP_TRUE@   ./$(DEPDIR)/acpi-freebsd.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/battstat_applet.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/power-management.Po \
 @AMDEP_TRUE@   ./$(DEPDIR)/properties.Po
@@ -324,6 +325,7 @@
 glade_DATA = battstat_applet.glade
 desktop_iconsdir = $(iconsdir)/hicolor/48x48/apps
 desktop_icons_DATA = battstat.png
+ACPIINC = @ACPIINC@
 @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a
 @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm
 @NEED_LIBAPM_FALSE@APMLIB = 
@@ -339,6 +341,7 @@
    $(GNOME_APPLETS_CFLAGS)         \
    $(LIBGLADE_CFLAGS)          \
    $(APMINC)               \
+   $(ACPIINC)              \
    -DG_LOG_DOMAIN=\"battstat_applet\"
 
 battstat_applet_2_SOURCES = \
@@ -348,7 +351,9 @@
    battstat_applet.c \
    power-management.c \
    acpi-linux.c \
-   acpi-linux.h
+   acpi-linux.h \
+   acpi-freebsd.c \
+   acpi-freebsd.h
 
 battstat_applet_2_LDADD = \
             $(GNOME_APPLETS_LIBS) \
@@ -443,6 +448,7 @@
    -rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@
--- battstat/battstat_applet.c.orig Thu Jan 13 08:21:14 2005
+++ battstat/battstat_applet.c  Thu Jan 13 23:50:43 2005
@@ -828,6 +828,7 @@
    "Seth Nickell <snickell@stanford.edu> (GNOME2 port)",
    "Davyd Madeley <davyd@madeley.id.au>",
    "Ryan Lortie <desrt@desrt.ca>",
+   "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)",
    NULL
    };
 
--- battstat/power-management.c.orig    Thu Jan 13 08:21:14 2005
+++ battstat/power-management.c Fri Jan 14 00:25:07 2005
@@ -75,6 +75,24 @@
 #ifdef __FreeBSD__
 
 #include <machine/apm_bios.h>
+#include "acpi-freebsd.h"
+
+struct acpi_info acpiinfo;
+gboolean using_acpi;
+int acpi_count;
+int acpiwatch;
+struct apm_info apminfo;
+
+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo);
+
+gboolean acpi_callback (gpointer data)
+{
+   if (acpi_process_event(&acpiinfo)) {
+       acpi_freebsd_read(&apminfo, &acpiinfo);
+   }
+
+   return TRUE;
+}
 
 static const char *
 apm_readinfo (BatteryStatus *status)
@@ -83,23 +101,37 @@
      FreeBSD.  Each time this functions is called (once every second)
      the APM device is opened, read from and then closed.
   */
-  struct apm_info apminfo;
   int fd;
 
   if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
 
-  fd = open(APMDEVICE, O_RDONLY);
-  if (fd == -1)
-    return ERR_OPEN_APMDEV;
+  if (using_acpi) {
+    fd = -1;
+    if (acpi_count <= 0) {
+      acpi_count = 30;
+      acpi_freebsd_read(&apminfo, &acpiinfo);
+    }
+    acpi_count--;
+  }
+  else {
+    fd = open(APMDEVICE, O_RDONLY);
+    if (fd == -1) {
+      return ERR_OPEN_APMDEV;
+    }
 
-  if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
-    err(1, "ioctl(APMIO_GETINFO)");
+    if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
+      err(1, "ioctl(APMIO_GETINFO)");
 
-  close(fd);
+      close(fd);
+  }
 
   if(apminfo.ai_status == 0)
     return ERR_APM_E;
 
+  if (using_acpi) {
+    acpiwatch = g_timeout_add (5000, acpi_callback, NULL);
+  }
+
   status->present = TRUE;
   status->on_ac_power = apminfo.ai_acline ? 1 : 0;
   status->state = apminfo.ai_batt_stat;
@@ -320,6 +352,13 @@
         G_IO_IN | G_IO_ERR | G_IO_HUP,
         acpi_callback, NULL);
   }
+#elif defined(__FreeBSD__)
+  if (acpi_freebsd_init(&acpiinfo)) {
+    using_acpi = TRUE;
+    acpi_count = 0;
+  }
+  else
+    using_acpi = FALSE;
 #endif
 
   return NULL;
@@ -340,6 +379,13 @@
       g_source_remove(acpiwatch);
      acpiwatch = 0;
      acpi_linux_cleanup(&acpiinfo);
+  }
+#elif defined(__FreeBSD__)
+  if (using_acpi) {
+    if (acpiwatch != 0)
+      g_source_remove(acpiwatch);
+    acpiwatch = 0;
+    acpi_freebsd_cleanup(&acpiinfo);
   }
 #endif
 }