Re: -w for wsconsctl is not needed, update some manpages

2011-01-29 Thread Jason McIntyre
On Sun, Jan 30, 2011 at 01:28:21AM +0200, Henri Kemppainen wrote:
> As the subject says: the -w flag is no longer necessary (nor documented)
> for setting vars with wsconsctl, so don't advise people to use it.
> 

fixed, thanks.
jmc

> Index: src/share/man/man4/akbd.4
> ===
> RCS file: /cvs/src/share/man/man4/akbd.4,v
> retrieving revision 1.3
> diff -u -p -r1.3 akbd.4
> --- src/share/man/man4/akbd.4 31 May 2007 19:19:49 -  1.3
> +++ src/share/man/man4/akbd.4 29 Jan 2011 23:18:09 -
> @@ -138,7 +138,7 @@ This switches off the
>  To set a German keyboard layout without
>  .Dq dead accents ,
>  use
> -.Ic wsconsctl -w keyboard.encoding=de.nodead .
> +.Ic wsconsctl keyboard.encoding=de.nodead .
>  To set it at kernel build time, add
>  the following to the kernel configuration file:
>  .Bd -literal -offset indent
> Index: src/share/man/man4/hilkbd.4
> ===
> RCS file: /cvs/src/share/man/man4/hilkbd.4,v
> retrieving revision 1.12
> diff -u -p -r1.12 hilkbd.4
> --- src/share/man/man4/hilkbd.4   31 May 2007 19:19:50 -  1.12
> +++ src/share/man/man4/hilkbd.4   29 Jan 2011 23:18:09 -
> @@ -87,7 +87,7 @@ This switches off the
>  .Dq dead accents .
>  .Sh EXAMPLES
>  To set a Swedish keyboard mapping, use
> -.Ic wsconsctl -w keyboard.encoding=sv .
> +.Ic wsconsctl keyboard.encoding=sv .
>  To set it at kernel build time, regardless of what keyboard is plugged, add
>  the following to the kernel configuration file:
>  .Bd -literal -offset indent
> Index: src/share/man/man4/pckbd.4
> ===
> RCS file: /cvs/src/share/man/man4/pckbd.4,v
> retrieving revision 1.37
> diff -u -p -r1.37 pckbd.4
> --- src/share/man/man4/pckbd.47 Dec 2009 19:24:01 -   1.37
> +++ src/share/man/man4/pckbd.429 Jan 2011 23:18:09 -
> @@ -200,7 +200,7 @@ To set a German keyboard layout without
>  .Dq dead accents
>  and sending an ESC character before the key symbol if the ALT
>  key is pressed simultaneously, use
> -.Ic wsconsctl -w keyboard.encoding=de.nodead.metaesc .
> +.Ic wsconsctl keyboard.encoding=de.nodead.metaesc .
>  To set it at kernel build time, add
>  the following to the kernel configuration file:
>  .Bd -literal -offset indent
> Index: src/share/man/man4/ukbd.4
> ===
> RCS file: /cvs/src/share/man/man4/ukbd.4,v
> retrieving revision 1.19
> diff -u -p -r1.19 ukbd.4
> --- src/share/man/man4/ukbd.4 19 Sep 2010 12:52:43 -  1.19
> +++ src/share/man/man4/ukbd.4 29 Jan 2011 23:18:09 -
> @@ -227,7 +227,7 @@ To set a German keyboard layout without
>  .Dq dead accents
>  and sending an ESC character before the key symbol if the ALT
>  key is pressed simultaneously, use
> -.Ic wsconsctl -w keyboard.encoding=de.nodead.metaesc .
> +.Ic wsconsctl keyboard.encoding=de.nodead.metaesc .
>  To set it at kernel build time, add the following
>  to the kernel configuration file:
>  .Bd -literal -offset indent
> Index: src/share/man/man4/man4.sparc/zs.4
> ===
> RCS file: /cvs/src/share/man/man4/man4.sparc/zs.4,v
> retrieving revision 1.23
> diff -u -p -r1.23 zs.4
> --- src/share/man/man4/man4.sparc/zs.410 Jul 2010 19:38:39 -  
> 1.23
> +++ src/share/man/man4/man4.sparc/zs.429 Jan 2011 23:18:10 -
> @@ -142,7 +142,7 @@ This switches off the
>  .Dq dead accents .
>  .Sh EXAMPLES
>  To set a German keyboard layout, use
> -.Ic wsconsctl -w keyboard.encoding=de .
> +.Ic wsconsctl keyboard.encoding=de .
>  To set it at kernel build time, add
>  the following to the kernel configuration file for a type 4 keyboard:
>  .Bd -literal -offset indent
> Index: src/share/man/man4/man4.sparc64/zs.4
> ===
> RCS file: /cvs/src/share/man/man4/man4.sparc64/zs.4,v
> retrieving revision 1.16
> diff -u -p -r1.16 zs.4
> --- src/share/man/man4/man4.sparc64/zs.4  20 May 2009 20:13:42 -  
> 1.16
> @@ -137,7 +137,7 @@ This switches off the
>  .Dq dead accents .
>  .Sh EXAMPLES
>  To set a German keyboard layout, use
> -.Ic wsconsctl -w keyboard.encoding=de .
> +.Ic wsconsctl keyboard.encoding=de .
>  To set it at kernel build time, add
>  the following to the kernel configuration file for a type 4 keyboard:
>  .Bd -literal -offset indent
> Index: src/share/man/man4/man4.vax/lkkbd.4
> ===
> RCS file: /cvs/src/share/man/man4/man4.vax/lkkbd.4,v
> retrieving revision 1.11
> diff -u -p -r1.11 lkkbd.4
> --- src/share/man/man4/man4.vax/lkkbd.4   31 May 2007 19:19:57 -  
> 1.11
> +++ src/share/man/man4/man4.vax/lkkbd.4   29 Jan 2011 23:18:10 -
> @@ -154,7 +154,7 @@ This switches off the
>  .Dq dead accents .
>  .Sh EXAMPLES

Fix alc(4) watchdog timeouts and panics

2011-01-29 Thread Gabriel Linder
This diff fix some problems on my EeePC 1005PX :
- splassert failure when booting without a network cable
- panic when unplugging a network cable
- network does not come back when plugging a network cable
- watchdog timeouts

Most of the fixes are coming from FreeBSD. if_alcreg.h had only typos.

If gmail mess with the diff there is a copy available at
http://dargor.servebeer.com/~dargor/openbsd/if_alc_fix3.diff

Index: if_alcreg.h
===
RCS file: /cvs/openbsd/src/sys/dev/pci/if_alcreg.h,v
retrieving revision 1.1
diff -u -r1.1 if_alcreg.h
--- if_alcreg.h 8 Aug 2009 09:31:13 -   1.1
+++ if_alcreg.h 30 Jan 2011 04:33:06 -
@@ -18,12 +18,12 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMATES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMATE.
+ * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/alc/if_alcreg.h,v 1.1 2009/06/10 02:07:58
yongari Exp $
  */
@@ -88,7 +88,7 @@
 #definePM_CFG_PCIE_RECV0x8000
 #definePM_CFG_L1_ENTRY_TIMER_MASK  0x000F
 #definePM_CFG_PM_REQ_TIMER_MASK0x00F0
-#definePM_CFG_LCKDET_TIMER_MASK0x3F00
+#definePM_CFG_LCKDET_TIMER_MASK0x0F00
 #definePM_CFG_MAC_ASPM_CHK 0x4000
 #definePM_CFG_HOTRST   0x8000
 #definePM_CFG_L0S_ENTRY_TIMER_SHIFT8
@@ -98,8 +98,8 @@

 #defineALC_MASTER_CFG  0x1400
 #defineMASTER_RESET0x0001
+#defineMASTER_TEST_MODE_MASK   0x000C
 #defineMASTER_BERT_START   0x0010
-#defineMASTER_TEST_MODE_MASK   0x00C0
 #defineMASTER_MTIMER_ENB   0x0100
 #defineMASTER_MANUAL_INTR_ENB  0x0200
 #defineMASTER_IM_TX_TIMER_ENB  0x0400
@@ -1133,7 +1133,6 @@
 #defineALC_FLAG_ASPM_MON   0x0080
 #defineALC_FLAG_CMB_BUG0x0100
 #defineALC_FLAG_SMB_BUG0x0200
-#defineALC_FLAG_DETACH 0x4000
 #defineALC_FLAG_LINK   0x8000

struct timeout  alc_tick_ch;
Index: if_alc.c
===
RCS file: /cvs/openbsd/src/sys/dev/pci/if_alc.c,v
retrieving revision 1.9
diff -u -r1.9 if_alc.c
--- if_alc.c29 Jan 2011 08:13:46 -  1.9
+++ if_alc.c30 Jan 2011 04:33:07 -
@@ -76,7 +76,7 @@

 #include 

-intalc_match(struct device *, void *, void *);
+intalc_probe(struct device *, void *, void *);
 void   alc_attach(struct device *, struct device *, void *);
 intalc_detach(struct device *, int);
 intalc_activate(struct device *, int);
@@ -129,7 +129,7 @@
 };

 struct cfattach alc_ca = {
-   sizeof (struct alc_softc), alc_match, alc_attach, NULL,
+   sizeof (struct alc_softc), alc_probe, alc_attach, alc_detach,
alc_activate
 };

@@ -200,14 +200,13 @@
 {
struct alc_softc *sc = (struct alc_softc *)dev;
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
-   struct mii_data *mii;
+   struct mii_data *mii = &sc->sc_miibus;
uint32_t reg;

-   if ((ifp->if_flags & IFF_RUNNING) == 0)
+   if (mii == NULL || ifp == NULL ||
+   (ifp->if_flags & IFF_RUNNING) == 0)
return;

-   mii = &sc->sc_miibus;
-
sc->alc_flags &= ~ALC_FLAG_LINK;
if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
(IFM_ACTIVE | IFM_AVALID)) {
@@ -236,8 +235,8 @@
reg = CSR_READ_4(sc, ALC_MAC_CFG);
reg |= MAC_CFG_TX_ENB | MAC_CFG_RX_ENB;
CSR_WRITE_4(sc, ALC_MAC_CFG, reg);
+   alc_aspm(sc);
}
-   alc_aspm(sc);
 }

 void
@@ -246,6 +245,9 @@
struct alc_softc *sc = ifp->if_softc;
struct mii_data *mii = &sc->sc_miibus;

+   if ((ifp->if_flags & IFF_UP) == 0)
+   return;
+
mii_pollstat(mii);
ifmr->ifm_status = mii->mii_media_status;
ifmr->ifm_active = mii->mii_media_active;
@@ -270,7 +272,7 @@
 }

 int
-alc_match(struct device *dev, void *match, void *aux)
+alc_probe(struct device *dev, void *match, void *aux)
 {
return pci_matchbyid((struct pci_attach_args *)aux, alc_devices,
nitems(alc_devices));
@@ -1138,7 +1140,8 @@
str

sysjail vs. FreeBSD jails

2011-01-29 Thread Dustin Cannon
Hi Tech,

After reading about FreeBSD jails I naturally wondered whether OpenBSD
had a similar feature.  Well, I ran across sysjail.  Based on my
reading of the wikipedia article, it's my understanding that sysjail
was discontinued due to an inherent flaw involving race conditions.
If I understand correctly, sysjail used user-space wrappers to system
calls to enforce security policy, while FreeBSD jails are an in-kernel
sandboxing mechanism.  Assuming I'm not totally misunderstanding both
sysjail and FreeBSD jails (and admittedly I have much more research to
do), I'm curious as to whether the OpenBSD project has ever considered
implementing a full operating system-level virtualization technology
like FreeBSD jails.  I'd also be interested to hear any arguments for
or against implementing such jails in OpenBSD.  I have not conducted a
search of the mailing list archives beyond looking for discussion of
sysjail, so I apologize if this has already been thoroughly discussed
in another thread.  Thanks for your time and I really appreciate the
work you guys do in making a very high-quality and secure operating
system freely available.

-- 
-Dustin



another run device

2011-01-29 Thread Ted Unangst
usbdevs -v output:

port 1 addr 2: high speed, power 450 mA, config 1, 802.11 n WLAN(0x3c2c), 
Ralink(0x14b2), rev 1.01, iSerialNumber 1.0

I don't know if it's strictly a 3070, but it's new and very tiny, so it 
seemed like the best guess.

Index: if_run.c
===
RCS file: /home/tedu/cvs/src/sys/dev/usb/if_run.c,v
retrieving revision 1.84
diff -u -r1.84 if_run.c
--- if_run.c25 Jan 2011 20:03:35 -  1.84
+++ if_run.c30 Jan 2011 03:17:32 -
@@ -142,6 +142,7 @@
USB_ID(CONCEPTRONIC2,   RT2870_8),
USB_ID(CONCEPTRONIC2,   RT3070_1),
USB_ID(CONCEPTRONIC2,   RT3070_2),
+   USB_ID(CONCEPTRONIC2,   RT3070_3),
USB_ID(CONCEPTRONIC2,   VIGORN61),
USB_ID(COREGA,  CGWLUSB300GNM),
USB_ID(COREGA,  RT2870_1),
Index: usbdevs
===
RCS file: /home/tedu/cvs/src/sys/dev/usb/usbdevs,v
retrieving revision 1.538
diff -u -r1.538 usbdevs
--- usbdevs 17 Jan 2011 10:26:43 -  1.538
+++ usbdevs 30 Jan 2011 03:17:46 -
@@ -1207,6 +1207,7 @@
 product CONCEPTRONIC2 C54RU0x3c02  C54RU WLAN
 product CONCEPTRONIC2 RT3070_1 0x3c08  RT3070
 product CONCEPTRONIC2 RT3070_2 0x3c11  RT3070
+product CONCEPTRONIC2 RT3070_3 0x3c2c  RT3070
 product CONCEPTRONIC2 C54RU2   0x3c22  C54RU
 product CONCEPTRONIC2 VIGORN61 0x3c25  VIGORN61
 product CONCEPTRONIC2 RT2870_1 0x3c06  RT2870
Index: usbdevs.h
===
RCS file: /home/tedu/cvs/src/sys/dev/usb/usbdevs.h,v
retrieving revision 1.548
diff -u -r1.548 usbdevs.h
--- usbdevs.h   17 Jan 2011 10:29:05 -  1.548
+++ usbdevs.h   30 Jan 2011 03:17:47 -
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs.h,v 1.548 2011/01/17 10:29:05 kevlo Exp $ */
+/* $OpenBSD$   */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -1214,6 +1214,7 @@
 #defineUSB_PRODUCT_CONCEPTRONIC2_C54RU 0x3c02  /* C54RU WLAN */
 #defineUSB_PRODUCT_CONCEPTRONIC2_RT3070_1  0x3c08  /* 
RT3070 */
 #defineUSB_PRODUCT_CONCEPTRONIC2_RT3070_2  0x3c11  /* 
RT3070 */
+#defineUSB_PRODUCT_CONCEPTRONIC2_RT3070_3  0x3c2c  /* 
RT3070 */
 #defineUSB_PRODUCT_CONCEPTRONIC2_C54RU20x3c22  /* 
C54RU */
 #defineUSB_PRODUCT_CONCEPTRONIC2_VIGORN61  0x3c25  /* 
VIGORN61 */
 #defineUSB_PRODUCT_CONCEPTRONIC2_RT2870_1  0x3c06  /* 
RT2870 */
Index: usbdevs_data.h
===
RCS file: /home/tedu/cvs/src/sys/dev/usb/usbdevs_data.h,v
retrieving revision 1.542
diff -u -r1.542 usbdevs_data.h
--- usbdevs_data.h  17 Jan 2011 10:29:05 -  1.542
+++ usbdevs_data.h  30 Jan 2011 03:17:47 -
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdevs_data.h,v 1.542 2011/01/17 10:29:05 kevlo Exp $
*/
+/* $OpenBSD$   */
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -1663,6 +1663,10 @@
},
{
USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT3070_2,
+   "RT3070",
+   },
+   {
+   USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_RT3070_3,
"RT3070",
},
{



All in one email/phone no. Scraper, Bulk Emailer, & Voice Broadcast System - 99% accurate data

2011-01-29 Thread Danny Chasar
http://www.leadnetpro.com/livenow

With LeadNetPro you now have one of the most powerful lead generation systems 
ever created online. Through our software and services that are provided, you 
are able to target your marketing efforts to virtually any industry within 
minutes.
 
In this quick overview we just want to cover some of the main components that 
LeadNetPro provides to you... the end user.
 
Through our web based software and services you are provided with multiple 
extractors, an emailing system and a phone broadcasting service that is 
combined within one platform.
 
Below you will find a brief description of each of these powerful features and 
how they can instantly improve your marketing efforts and profit margins.
 
 
 
LeadNetPro Extractors
 
Your extractors included with your LeadNetPro software are some of the most 
accurate harvesters ever created.
 
You now have the power to extract thousands of leads daily from directories, 
search engines and classified ad sites.
 
Each extractor is equipped with built-in filters allowing you to pull 99% 
accurate data to use in your marketing efforts.
 
Every extraction is also automatically labeled according to your search and 
cataloged allowing you to manage your lists at any time and store them for as 
long as you wish.
 
And since your software is web based, you are able to access your extractors 
from any computer as long as you have an internet connection.
 
 
 
LeadNetPro Mailer
 
The emailer included with your software is designed for high deliverability 
rates for any email marketing campaign you put together.
 
With our set and forget design... you are able to upload your email list, 
create your messages and click send within minutes getting your campaign under 
way.
 
Once your email campaign has started, you can continue to extract more leads 
for your marketing efforts or even logout of the system and your emails will 
continue to be sent according to the delivery rate you selected for your 
campaign.
 
 
 
LeadNetPro Phone Broadcasting
 
With our state of the art phone broadcasting system at your fingertips, you now 
have the power to contact thousands of leads within minutes.
 
It only takes seconds to create a broadcast campaign, and there are no required 
minimum purchases on call minutes with our system either. Only purchase the 
minutes you need for your campaigns and your account is credited instantly so 
you can begin your broadcast with no delays.
 
Simply upload your CSV list and create a campaign for the industry you are 
targeting.
 
When creating your campaign you are able to upload or record by phone your 
outgoing messages, select live call transfers and have your list automatically 
scrubbed against the federal DNC list.
 
The list of features included with our phone broadcasting platform are truly 
incredible and when you put them to use in your marketing efforts, you will 
definitely notice the results.

Sincerely, Caulon Chasar
http://www.leadnetpro.com/livenow



-w for wsconsctl is not needed, update some manpages

2011-01-29 Thread Henri Kemppainen
As the subject says: the -w flag is no longer necessary (nor documented)
for setting vars with wsconsctl, so don't advise people to use it.

Index: src/share/man/man4/akbd.4
===
RCS file: /cvs/src/share/man/man4/akbd.4,v
retrieving revision 1.3
diff -u -p -r1.3 akbd.4
--- src/share/man/man4/akbd.4   31 May 2007 19:19:49 -  1.3
+++ src/share/man/man4/akbd.4   29 Jan 2011 23:18:09 -
@@ -138,7 +138,7 @@ This switches off the
 To set a German keyboard layout without
 .Dq dead accents ,
 use
-.Ic wsconsctl -w keyboard.encoding=de.nodead .
+.Ic wsconsctl keyboard.encoding=de.nodead .
 To set it at kernel build time, add
 the following to the kernel configuration file:
 .Bd -literal -offset indent
Index: src/share/man/man4/hilkbd.4
===
RCS file: /cvs/src/share/man/man4/hilkbd.4,v
retrieving revision 1.12
diff -u -p -r1.12 hilkbd.4
--- src/share/man/man4/hilkbd.4 31 May 2007 19:19:50 -  1.12
+++ src/share/man/man4/hilkbd.4 29 Jan 2011 23:18:09 -
@@ -87,7 +87,7 @@ This switches off the
 .Dq dead accents .
 .Sh EXAMPLES
 To set a Swedish keyboard mapping, use
-.Ic wsconsctl -w keyboard.encoding=sv .
+.Ic wsconsctl keyboard.encoding=sv .
 To set it at kernel build time, regardless of what keyboard is plugged, add
 the following to the kernel configuration file:
 .Bd -literal -offset indent
Index: src/share/man/man4/pckbd.4
===
RCS file: /cvs/src/share/man/man4/pckbd.4,v
retrieving revision 1.37
diff -u -p -r1.37 pckbd.4
--- src/share/man/man4/pckbd.4  7 Dec 2009 19:24:01 -   1.37
+++ src/share/man/man4/pckbd.4  29 Jan 2011 23:18:09 -
@@ -200,7 +200,7 @@ To set a German keyboard layout without
 .Dq dead accents
 and sending an ESC character before the key symbol if the ALT
 key is pressed simultaneously, use
-.Ic wsconsctl -w keyboard.encoding=de.nodead.metaesc .
+.Ic wsconsctl keyboard.encoding=de.nodead.metaesc .
 To set it at kernel build time, add
 the following to the kernel configuration file:
 .Bd -literal -offset indent
Index: src/share/man/man4/ukbd.4
===
RCS file: /cvs/src/share/man/man4/ukbd.4,v
retrieving revision 1.19
diff -u -p -r1.19 ukbd.4
--- src/share/man/man4/ukbd.4   19 Sep 2010 12:52:43 -  1.19
+++ src/share/man/man4/ukbd.4   29 Jan 2011 23:18:09 -
@@ -227,7 +227,7 @@ To set a German keyboard layout without
 .Dq dead accents
 and sending an ESC character before the key symbol if the ALT
 key is pressed simultaneously, use
-.Ic wsconsctl -w keyboard.encoding=de.nodead.metaesc .
+.Ic wsconsctl keyboard.encoding=de.nodead.metaesc .
 To set it at kernel build time, add the following
 to the kernel configuration file:
 .Bd -literal -offset indent
Index: src/share/man/man4/man4.sparc/zs.4
===
RCS file: /cvs/src/share/man/man4/man4.sparc/zs.4,v
retrieving revision 1.23
diff -u -p -r1.23 zs.4
--- src/share/man/man4/man4.sparc/zs.4  10 Jul 2010 19:38:39 -  1.23
+++ src/share/man/man4/man4.sparc/zs.4  29 Jan 2011 23:18:10 -
@@ -142,7 +142,7 @@ This switches off the
 .Dq dead accents .
 .Sh EXAMPLES
 To set a German keyboard layout, use
-.Ic wsconsctl -w keyboard.encoding=de .
+.Ic wsconsctl keyboard.encoding=de .
 To set it at kernel build time, add
 the following to the kernel configuration file for a type 4 keyboard:
 .Bd -literal -offset indent
Index: src/share/man/man4/man4.sparc64/zs.4
===
RCS file: /cvs/src/share/man/man4/man4.sparc64/zs.4,v
retrieving revision 1.16
diff -u -p -r1.16 zs.4
--- src/share/man/man4/man4.sparc64/zs.420 May 2009 20:13:42 -  
1.16
@@ -137,7 +137,7 @@ This switches off the
 .Dq dead accents .
 .Sh EXAMPLES
 To set a German keyboard layout, use
-.Ic wsconsctl -w keyboard.encoding=de .
+.Ic wsconsctl keyboard.encoding=de .
 To set it at kernel build time, add
 the following to the kernel configuration file for a type 4 keyboard:
 .Bd -literal -offset indent
Index: src/share/man/man4/man4.vax/lkkbd.4
===
RCS file: /cvs/src/share/man/man4/man4.vax/lkkbd.4,v
retrieving revision 1.11
diff -u -p -r1.11 lkkbd.4
--- src/share/man/man4/man4.vax/lkkbd.4 31 May 2007 19:19:57 -  1.11
+++ src/share/man/man4/man4.vax/lkkbd.4 29 Jan 2011 23:18:10 -
@@ -154,7 +154,7 @@ This switches off the
 .Dq dead accents .
 .Sh EXAMPLES
 To set a French keyboard layout, use
-.Ic wsconsctl -w keyboard.encoding=fr .
+.Ic wsconsctl keyboard.encoding=fr .
 To set it at kernel build time, add
 the following to the kernel configuration file:
 .Bd -literal -offset indent



Re: Lenovo Thinkpad X201 iwn, and screen brightness issues

2011-01-29 Thread Amarendra Godbole
On Sat, Jan 29, 2011 at 10:37 AM, Federico G. Schwindt 
wrote:
> On Sat, Jan 29, 2011 at 08:19:06AM +0530, Amarendra Godbole wrote:
>> Hi,
>>
>> I recently switched over to Lenovo X201 notebook, from my older X61s.
>> OpenBSD worked flawlessly when I switched the harddisks (cool!). I
>> recently updated the src, and rebuilt the kernel, userland, and
>> xenocara (okay, I do run -current, and know the implications :-)). I
>> am facing two issues:
>>
>> (1) Wireless stopped working - it was working before I pulled in the
>> update sometime last week. The new if_iwn.c is v1.108 committed on
>> 2011/01/09 by damien. The manpage suggested I should have v5.6
>> firmware, so I did that too - earlier version was 5.3. It still does
>> not work. I can scan and the network is detected fine, but it simply
>> does not get the IP address, and keeps on showing me the dots, and
>> blinking.
>
>  version 1.109 should fix this. please update your tree.
>
>  f.-
[...]

Thanks. Fixed, and works fine now. I forgot that I had auto-sync of
the src turned-off, so never realized there was a 1.109 version. :-)

-Amarendra



Re: intel driver fix (PR6517)

2011-01-29 Thread Marco Pfatschbacher
On Sat, Jan 29, 2011 at 12:45:25PM +0100, Matthieu Herrb wrote:
> Hi,
> 
> More last minute X patches...
> 
> mpf@ reported in PR6517 a problem with his 965GM chipset. 

No, I have an 865G.
 
> He did some debugging and found that a patch to the kernel i915 drm
> driver from one of the  X.Org maintaines (Chris Wilson) fixes his
> issues. I don't understand the patch

Me neither. I've no idea what the HIC or GWB is supposed to do.
I just gave it a shot and it worked.
I didn't mean to have this patch commited as is.

> (the X.Org bug report is about
> i855 cache coherency problems, not about 965GM) but since it helps
> both mpf and mcbride@ machines, I would like to see this committed. 

As said, I have an 856G

> But wider testing is needed. Please apply the patch below to any
> machine you have running X with an intel chipset. Report success or
> failure to me please, with a dmesg and /var/log/Xorg.0.log. 

Only people with chips that are not IS_I9XX() should be affected
by this diff.

> Thanks in advance.
> 
> Original bug report:
> https://bugs.freedesktop.org/show_bug.cgi?id=27187
> and patch :
> https://bugs.freedesktop.org//attachment.cgi?id=41531
> 
> Index: i915_drv.c
> ===
> RCS file: /cvs/OpenBSD/src/sys/dev/pci/drm/i915_drv.c,v
> retrieving revision 1.101
> diff -u -r1.101 i915_drv.c
> --- i915_drv.c21 Sep 2010 23:05:41 -  1.101
> +++ i915_drv.c29 Jan 2011 08:32:29 -
> @@ -995,16 +995,17 @@
>   bus_space_write_4(dev_priv->ifp.i9xx.bst,
>   dev_priv->ifp.i9xx.bsh, 0, 1);
>   } else {
> - /*
> -  * I8XX don't have a flush page mechanism, but do have the
> -  * cache. Do it the bruteforce way. we write 1024 byes into
> -  * the cache, then clflush them out so they'll kick the stuff
> -  * we care about out of the chipset cache.
> -  */
> - if (dev_priv->ifp.i8xx.kva != NULL) {
> - memset(dev_priv->ifp.i8xx.kva, 0, 1024);
> - agp_flush_cache_range((vaddr_t)dev_priv->ifp.i8xx.kva,
> - 1024);
> + int i;
> +
> + wbinvd();
> +
> +#define I830_HIC 0x70
> +
> + I915_WRITE(I830_HIC, (I915_READ(I830_HIC) | (1<<31)));
> + for (i = 1000; i; i--) {
> + if (!(I915_READ(I830_HIC) & (1<<31)))
> + break;
> + delay(100);
>   }
>   }
>  }
> 
> -- 
> Matthieu Herrb



Re: intel driver fix (PR6517)

2011-01-29 Thread Marco Peereboom
On Sat, Jan 29, 2011 at 12:45:25PM +0100, Matthieu Herrb wrote:
> Hi,
> 
> More last minute X patches...
> 
> mpf@ reported in PR6517 a problem with his 965GM chipset. 
> 
> He did some debugging and found that a patch to the kernel i915 drm
> driver from one of the  X.Org maintaines (Chris Wilson) fixes his
> issues. I don't understand the patch (the X.Org bug report is about
> i855 cache coherency problems, not about 965GM) but since it helps
> both mpf and mcbride@ machines, I would like to see this committed. 
> 
> But wider testing is needed. Please apply the patch below to any
> machine you have running X with an intel chipset. Report success or
> failure to me please, with a dmesg and /var/log/Xorg.0.log. 
> 
> Thanks in advance.
> 
> Original bug report:
> https://bugs.freedesktop.org/show_bug.cgi?id=27187
> and patch :
> https://bugs.freedesktop.org//attachment.cgi?id=41531
> 
> Index: i915_drv.c
> ===
> RCS file: /cvs/OpenBSD/src/sys/dev/pci/drm/i915_drv.c,v
> retrieving revision 1.101
> diff -u -r1.101 i915_drv.c
> --- i915_drv.c21 Sep 2010 23:05:41 -  1.101
> +++ i915_drv.c29 Jan 2011 08:32:29 -
> @@ -995,16 +995,17 @@
>   bus_space_write_4(dev_priv->ifp.i9xx.bst,
>   dev_priv->ifp.i9xx.bsh, 0, 1);
>   } else {
> - /*
> -  * I8XX don't have a flush page mechanism, but do have the
> -  * cache. Do it the bruteforce way. we write 1024 byes into
> -  * the cache, then clflush them out so they'll kick the stuff
> -  * we care about out of the chipset cache.
> -  */
> - if (dev_priv->ifp.i8xx.kva != NULL) {
> - memset(dev_priv->ifp.i8xx.kva, 0, 1024);
> - agp_flush_cache_range((vaddr_t)dev_priv->ifp.i8xx.kva,
> - 1024);
> + int i;
> +
> + wbinvd();

That is a very large hammer.  How often is this code called?

> +
> +#define I830_HIC 0x70
> +
> + I915_WRITE(I830_HIC, (I915_READ(I830_HIC) | (1<<31)));
> + for (i = 1000; i; i--) {
^^
really?

> + if (!(I915_READ(I830_HIC) & (1<<31)))
> + break;
> + delay(100);
>   }
>   }
>  }
> 
> -- 
> Matthieu Herrb



intel driver fix (PR6517)

2011-01-29 Thread Matthieu Herrb
Hi,

More last minute X patches...

mpf@ reported in PR6517 a problem with his 965GM chipset. 

He did some debugging and found that a patch to the kernel i915 drm
driver from one of the  X.Org maintaines (Chris Wilson) fixes his
issues. I don't understand the patch (the X.Org bug report is about
i855 cache coherency problems, not about 965GM) but since it helps
both mpf and mcbride@ machines, I would like to see this committed. 

But wider testing is needed. Please apply the patch below to any
machine you have running X with an intel chipset. Report success or
failure to me please, with a dmesg and /var/log/Xorg.0.log. 

Thanks in advance.

Original bug report:
https://bugs.freedesktop.org/show_bug.cgi?id=27187
and patch :
https://bugs.freedesktop.org//attachment.cgi?id=41531

Index: i915_drv.c
===
RCS file: /cvs/OpenBSD/src/sys/dev/pci/drm/i915_drv.c,v
retrieving revision 1.101
diff -u -r1.101 i915_drv.c
--- i915_drv.c  21 Sep 2010 23:05:41 -  1.101
+++ i915_drv.c  29 Jan 2011 08:32:29 -
@@ -995,16 +995,17 @@
bus_space_write_4(dev_priv->ifp.i9xx.bst,
dev_priv->ifp.i9xx.bsh, 0, 1);
} else {
-   /*
-* I8XX don't have a flush page mechanism, but do have the
-* cache. Do it the bruteforce way. we write 1024 byes into
-* the cache, then clflush them out so they'll kick the stuff
-* we care about out of the chipset cache.
-*/
-   if (dev_priv->ifp.i8xx.kva != NULL) {
-   memset(dev_priv->ifp.i8xx.kva, 0, 1024);
-   agp_flush_cache_range((vaddr_t)dev_priv->ifp.i8xx.kva,
-   1024);
+   int i;
+
+   wbinvd();
+
+#define I830_HIC   0x70
+
+   I915_WRITE(I830_HIC, (I915_READ(I830_HIC) | (1<<31)));
+   for (i = 1000; i; i--) {
+   if (!(I915_READ(I830_HIC) & (1<<31)))
+   break;
+   delay(100);
}
}
 }

-- 
Matthieu Herrb



Re: alc0 panic and splassert: assertwaitok: want -1 have 1

2011-01-29 Thread Kevin Lo
Gabriel Linder wrote:
> On 01/27/11 09:13, Gabriel Linder wrote:
> > When booting 4.9-beta/amd64 without a network cable plugged, I get a 
> > lot of splassert failures.
> >
> > After changing kern.splassert to 3 I was able to get the following 
> > trace (get with dmesg after a reboot) :
> >
> > OpenBSD 4.9-beta (GENERIC.MP) #786: Tue Jan 25 17:46:34 MST 2011
> > t...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
> > real mem = 1062797312 (1013MB)
> > avail mem = 1020477440 (973MB)
> > mainbus0 at root
> > bios0 at mainbus0: SMBIOS rev. 2.6 @ 0xf0760 (31 entries)
> > bios0: vendor American Megatrends Inc. version "0904" date 08/12/2010
> > bios0: ASUSTeK Computer INC. 1005PX
> > acpi0 at bios0: rev 2
> > acpi0: sleep states S0 S3 S4 S5
> > acpi0: tables DSDT FACP APIC MCFG ECDT OEMB HPET GSCI SSDT SLIC
> > acpi0: wakeup devices P0P1(S4) P0P4(S4) P0P5(S4) P0P6(S4) P0P7(S4)
> > acpitimer0 at acpi0: 3579545 Hz, 24 bits
> > acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
> > cpu0 at mainbus0: apid 0 (boot processor)
> > cpu0: Intel(R) Atom(TM) CPU N450 @ 1.66GHz, 1666.71 MHz
> > cpu0: 
> > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,EST,TM2,SSSE3,CX16,xTPR,PDCM,MOVBE,NXE,LONG
> > cpu0: 512KB 64b/line 8-way L2 cache
> > cpu0: apic clock running at 166MHz
> > cpu1 at mainbus0: apid 1 (application processor)
> > cpu1: Intel(R) Atom(TM) CPU N450 @ 1.66GHz, 1666.48 MHz
> > cpu1: 
> > FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,SSE3,MWAIT,DS-CPL,EST,TM2,SSSE3,CX16,xTPR,PDCM,MOVBE,NXE,LONG
> > cpu1: 512KB 64b/line 8-way L2 cache
> > ioapic0 at mainbus0: apid 2 pa 0xfec0, version 20, 24 pins
> > ioapic0: misconfigured as apic 1, remapped to apid 2
> > acpimcfg0 at acpi0 addr 0xe000, bus 0-255
> > acpiec0 at acpi0acpiec _REG failed, broken BIOS
> >
> > acpihpet0 at acpi0: 14318179 Hz
> > acpiprt0 at acpi0: bus 0 (PCI0)
> > acpiprt1 at acpi0: bus 4 (P0P4)
> > acpiprt2 at acpi0: bus 2 (P0P5)
> > acpiprt3 at acpi0: bus -1 (P0P6)
> > acpiprt4 at acpi0: bus 1 (P0P7)
> > acpiec at acpi0 not configured
> > acpicpu0 at acpi0: C3, C2, C1, PSS
> > acpicpu1 at acpi0: C3, C2, C1, PSS
> > acpitz at acpi0 not configured
> > acpibat at acpi0 not configured
> > acpiac at acpi0 not configured
> > acpiasus0 at acpi0
> > acpibtn0 at acpi0: LID_
> > acpibtn1 at acpi0: SLPB
> > acpibtn2 at acpi0: PWRB
> > acpivideo0 at acpi0: VGA_
> > acpivout0 at acpivideo0: CRTD
> > acpivout1 at acpivideo0: TVOD
> > acpivout2 at acpivideo0: LCDD
> > cpu0: Enhanced SpeedStep 1666 MHz: speeds: 1667, 1333, 1000 MHz
> > pci0 at mainbus0 bus 0
> > pchb0 at pci0 dev 0 function 0 "Intel Pineview DMI" rev 0x00
> > vga1 at pci0 dev 2 function 0 "Intel Pineview Video" rev 0x00
> > wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
> > wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
> > intagp0 at vga1
> > agp0 at intagp0: aperture at 0xd000, size 0x1000
> > inteldrm0 at vga1: apic 2 int 16 (irq 15)
> > drm0 at inteldrm0
> > "Intel Pineview Video" rev 0x00 at pci0 dev 2 function 1 not configured
> > azalia0 at pci0 dev 27 function 0 "Intel 82801GB HD Audio" rev 0x02: 
> > apic 2 int 22 (irq 4)
> > azalia0: codecs: Realtek ALC269
> > audio0 at azalia0
> > ppb0 at pci0 dev 28 function 0 "Intel 82801GB PCIE" rev 0x02: apic 2 
> > int 16 (irq 15)
> > pci1 at ppb0 bus 4
> > ppb1 at pci0 dev 28 function 1 "Intel 82801GB PCIE" rev 0x02: apic 2 
> > int 17 (irq 10)
> > pci2 at ppb1 bus 2
> > athn0 at pci2 dev 0 function 0 "Atheros AR2427" rev 0x01: apic 2 int 
> > 17 (irq 10)
> > athn0: AR9285 rev 2 (1T1R), ROM rev 13, address 48:5d:60:24:0f:2b
> > ppb2 at pci0 dev 28 function 3 "Intel 82801GB PCIE" rev 0x02: apic 2 
> > int 19 (irq 11)
> > pci3 at ppb2 bus 1
> > alc0 at pci3 dev 0 function 0 "Attansic Technology L2C" rev 0xc0: apic 
> > 2 int 19 (irq 11), address 20:cf:30:70:8f:31
> > atphy0 at alc0 phy 0: F1 10/100/1000 PHY, rev. 11
> > uhci0 at pci0 dev 29 function 0 "Intel 82801GB USB" rev 0x02: apic 2 
> > int 23 (irq 3)
> > uhci1 at pci0 dev 29 function 1 "Intel 82801GB USB" rev 0x02: apic 2 
> > int 19 (irq 11)
> > uhci2 at pci0 dev 29 function 2 "Intel 82801GB USB" rev 0x02: apic 2 
> > int 18 (irq 7)
> > uhci3 at pci0 dev 29 function 3 "Intel 82801GB USB" rev 0x02: apic 2 
> > int 16 (irq 15)
> > ehci0 at pci0 dev 29 function 7 "Intel 82801GB USB" rev 0x02: apic 2 
> > int 23 (irq 3)
> > usb0 at ehci0: USB revision 2.0
> > uhub0 at usb0 "Intel EHCI root hub" rev 2.00/1.00 addr 1
> > ppb3 at pci0 dev 30 function 0 "Intel 82801BAM Hub-to-PCI" rev 0xe2
> > pci4 at ppb3 bus 5
> > pcib0 at pci0 dev 31 function 0 "Intel Tigerpoint LPC" rev 0x02
> > ahci0 at pci0 dev 31 function 2 "Intel 82801GR AHCI" rev 0x02: apic 2 
> > int 21 (irq 5), AHCI 1.1
> > scsibus0 at ahci0: 32 targets
> > sd0 at scsibus0 targ 0 lun 0:  SCSI3 
> > 0/direct fixed
> > sd0: 238475MB, 512 byte