Changeset 153 for sbliveos2/trunk/lib32

Timestamp:

Jul 23, 2000, 6:21:57 PM (25 years ago)

Author:

sandervl

Message:

update

Location:

sbliveos2/trunk/lib32

Files:

• misc.c (modified) (1 diff)
• pci.c (modified) (2 diffs)
• sound.c (modified) (1 diff)

sbliveos2/trunk/lib32/misc.c

@@ -210 +210 @@
 
 
+/* --------------------------------------------------------------------- */
+/*
+ * hweightN: returns the hamming weight (i.e. the number
+ * of bits set) of a N-bit word
+ */
+
+#ifdef hweight32
+#undef hweight32
+#endif
+
+unsigned int hweight32(unsigned int w)
+{
+        unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555);
+        res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+        res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F);
+        res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF);
+        return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF);
+}

sbliveos2/trunk/lib32/pci.c

@@ -29 +29 @@
 #include <asm/uaccess.h>
 #include <asm/hardirq.h>
+#include <asm/io.h>
 
 #define LINUX
@@ -268 +269 @@
 //******************************************************************************
 //******************************************************************************
+int __compat_get_order(unsigned long size)
+{
+        int order;
+
+        size = (size-1) >> (PAGE_SHIFT-1);
+        order = -1;
+        do {
+                size >>= 1;
+                order++;
+        } while (size);
+        return order;
+}
+//******************************************************************************
+//******************************************************************************
+void *pci_alloc_consistent(struct pci_dev *hwdev,
+                           size_t size, dma_addr_t *dma_handle) {
+        void *ret;
+        int gfp = GFP_ATOMIC;
+
+        if (hwdev == NULL)
+                gfp |= GFP_DMA;
+        ret = (void *)__get_free_pages(gfp, __compat_get_order(size));
+
+        if (ret != NULL) {
+                memset(ret, 0, size);
+                *dma_handle = virt_to_bus(ret);
+        }
+        return ret;
+}
+//******************************************************************************
+//******************************************************************************
+void pci_free_consistent(struct pci_dev *hwdev, size_t size,
+                         void *vaddr, dma_addr_t dma_handle)
+{
+        free_pages((unsigned long)vaddr, __compat_get_order(size));
+}
+//******************************************************************************
+//******************************************************************************

sbliveos2/trunk/lib32/sound.c

@@ -576 +576 @@
         break;
   case MIX_SETVIDEOVOL:
-////    ioctl = SOUND_MIXER_WRITE_VIDEO;
+        ioctl = SOUND_MIXER_WRITE_VIDEO;
         break;
   case MIX_SETAUXVOL: