$NetBSD: patch-ae,v 1.2 2003/01/27 23:39:03 ad Exp $

--- dpteng/osd_unix.c.orig	Tue Aug 13 16:02:26 2002
+++ dpteng/osd_unix.c	Fri Dec 13 14:15:13 2002
@@ -2588,7 +2588,7 @@
 
         BufferID = shmget(IPC_PRIVATE,(int)(toLoggerTotalSize +
                           fromLoggerTotalSize),
-                          SHM_ALLRD | SHM_ALLWR | IPC_CREAT);
+                          SHM_URD | SHM_UWR | IPC_CREAT);
 
   /* If We Got The Segment, Try To Attach To It */
 
@@ -3676,7 +3676,7 @@
    uCHAR DataBuff[100];
    EATA_CP pkt;
    int IoctlRtn;
-#  if (defined(_DPT_FREE_BSD))
+#  if (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
        int   c;
        int   i2oMajorNode = 0;
        FILE *fp = popen (
@@ -3695,7 +3695,7 @@
    NumEntries = 0;
    for(i = 0; i < MAX_HAS; ++i)
      {
-#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
        int created = 0;
 #      endif
 
@@ -3710,7 +3710,7 @@
        IoctlRtn = osdSendIoctl(&HbaDevs[NumEntries],DPT_SIGNATURE,
                                DataBuff,&pkt);
 
-#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
        /*
         *   Use Alternate access.
         */
@@ -3758,7 +3758,7 @@
            HbaDevs[NumEntries].IoAddress = 0xffffffff;
            ++NumEntries;
         }
-#   if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+#   if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
          else if (created)
       {
          unlink (HbaDevs[NumEntries].NodeName);
@@ -3777,8 +3777,10 @@
         }
        HbaDevs[NumEntries].Flags = 0;
        strcpy(HbaDevs[NumEntries].NodeName,"/dev");
-#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD))
+#      if (defined(_DPT_BSDI) || defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
            strcat(HbaDevs[NumEntries].NodeName,"/rdptr");
+#      elif (defined(__NetBSD__))
+           strcat(HbaDevs[NumEntries].NodeName,"/dpt");
 #      else
            strcat(HbaDevs[NumEntries].NodeName,"/dptr");
 #      endif
@@ -3789,7 +3791,7 @@
        mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
         (MAJOR_NODE << 20) + (i << 10) + 0);
 #      undef MAJOR_NODE
-#      elif (defined(_DPT_FREE_BSD))
+#      elif (defined(_DPT_FREE_BSD)) && !defined(__NetBSD__)
 #      define MAJOR_NODE 88
        mknod(HbaDevs[NumEntries].NodeName, S_IFCHR|S_IRUSR|S_IWUSR,
         (MAJOR_NODE << 8) + i);