Changes in / [03362fbd:005b765] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.common (modified) (4 diffs)
• boot/arch/amd64/Makefile.inc (modified) (3 diffs)
• boot/grub.pc/stage2_eltorito (deleted)
• defaults/amd64/Makefile.config (modified) (1 diff)
• defaults/arm32/Makefile.config (modified) (1 diff)
• defaults/ia32/Makefile.config (modified) (1 diff)
• defaults/ia64/Makefile.config (modified) (1 diff)
• defaults/mips32/Makefile.config (modified) (1 diff)
• defaults/mips64/Makefile.config (modified) (1 diff)
• defaults/ppc32/Makefile.config (modified) (1 diff)
• defaults/sparc64/Makefile.config (modified) (1 diff)
• defaults/special/Makefile.config (modified) (1 diff)
• uspace/Makefile (modified) (6 diffs)
• uspace/Makefile.common (modified) (3 diffs)
• uspace/app/drec/Makefile (deleted)
• uspace/app/drec/drec.c (deleted)
• uspace/app/drec/wave.c (deleted)
• uspace/app/drec/wave.h (deleted)
• uspace/app/init/init.c (modified) (2 diffs)
• uspace/app/mixerctl/Makefile (deleted)
• uspace/app/mixerctl/mixerctl.c (deleted)
• uspace/app/wavplay/Makefile (deleted)
• uspace/app/wavplay/dplay.c (deleted)
• uspace/app/wavplay/dplay.h (deleted)
• uspace/app/wavplay/main.c (deleted)
• uspace/app/wavplay/wave.c (deleted)
• uspace/app/wavplay/wave.h (deleted)
• uspace/drv/audio/sb16/Makefile (deleted)
• uspace/drv/audio/sb16/ddf_log.h (deleted)
• uspace/drv/audio/sb16/dsp.c (deleted)
• uspace/drv/audio/sb16/dsp.h (deleted)
• uspace/drv/audio/sb16/dsp_commands.h (deleted)
• uspace/drv/audio/sb16/main.c (deleted)
• uspace/drv/audio/sb16/mixer.c (deleted)
• uspace/drv/audio/sb16/mixer.h (deleted)
• uspace/drv/audio/sb16/mixer_iface.c (deleted)
• uspace/drv/audio/sb16/pcm_iface.c (deleted)
• uspace/drv/audio/sb16/registers.h (deleted)
• uspace/drv/audio/sb16/sb16.c (deleted)
• uspace/drv/audio/sb16/sb16.h (deleted)
• uspace/drv/audio/sb16/sb16.ma (deleted)
• uspace/drv/bus/isa/i8237.c (modified) (9 diffs)
• uspace/drv/bus/isa/i8237.h (modified) (1 diff)
• uspace/drv/bus/isa/isa.c (modified) (26 diffs)
• uspace/lib/c/generic/device/hw_res.c (modified) (3 diffs)
• uspace/lib/c/generic/device/hw_res_parsed.c (modified) (6 diffs)
• uspace/lib/c/include/device/hw_res.h (modified) (2 diffs)
• uspace/lib/c/include/device/hw_res_parsed.h (modified) (1 diff)
• uspace/lib/c/include/ipc/dev_iface.h (modified) (1 diff)
• uspace/lib/drv/Makefile (modified) (2 diffs)
• uspace/lib/drv/generic/dev_iface.c (modified) (1 diff)
• uspace/lib/drv/generic/remote_audio_mixer.c (deleted)
• uspace/lib/drv/generic/remote_audio_pcm.c (deleted)
• uspace/lib/drv/generic/remote_hw_res.c (modified) (3 diffs)
• uspace/lib/drv/include/audio_mixer_iface.h (deleted)
• uspace/lib/drv/include/audio_pcm_iface.h (deleted)
• uspace/lib/drv/include/ops/hw_res.h (modified) (1 diff)
• uspace/lib/drv/include/remote_audio_mixer.h (deleted)
• uspace/lib/drv/include/remote_audio_pcm.h (deleted)
• uspace/lib/hound/Makefile (deleted)
• uspace/lib/hound/include/hound/client.h (deleted)
• uspace/lib/hound/include/hound/server.h (deleted)
• uspace/lib/hound/src/protocol.c (deleted)
• uspace/lib/pcm/Makefile (deleted)
• uspace/lib/pcm/include/pcm/format.h (deleted)
• uspace/lib/pcm/include/pcm/sample_format.h (deleted)
• uspace/lib/pcm/src/format.c (deleted)
• uspace/srv/audio/hound/Makefile (deleted)
• uspace/srv/audio/hound/audio_client.c (deleted)
• uspace/srv/audio/hound/audio_client.h (deleted)
• uspace/srv/audio/hound/audio_device.c (deleted)
• uspace/srv/audio/hound/audio_device.h (deleted)
• uspace/srv/audio/hound/audio_sink.c (deleted)
• uspace/srv/audio/hound/audio_sink.h (deleted)
• uspace/srv/audio/hound/audio_source.c (deleted)
• uspace/srv/audio/hound/audio_source.h (deleted)
• uspace/srv/audio/hound/hound.c (deleted)
• uspace/srv/audio/hound/hound.h (deleted)
• uspace/srv/audio/hound/log.h (deleted)
• uspace/srv/audio/hound/main.c (deleted)
• uspace/srv/locsrv/locsrv.c (modified) (1 diff)
• uspace/srv/net/tcp/tcp_header.h (deleted)

HelenOS.config

@@ -590 +590 @@
 ! CONFIG_OPTIMIZE_FOR_SIZE (n/y)
 
-% Number of consoles
-@ "1"
-@ "2"
-@ "3"
-@ "4"
-@ "5"
-@ "6"
-! CONFIG_VC_COUNT(choice)
-
-%Kernel log on console 6
-! CONFIG_KERNEL_LOG_VC_6 (y/n)
-
 % Barebone build with essential binaries only 
 ! CONFIG_BAREBONE (n/y)

boot/Makefile.common

@@ -119 +119 @@
         $(USPACE_PATH)/srv/taskmon/taskmon
 
-RD_DRVS_ESSENTIAL = \
-        infrastructure/root
-
-RD_DRVS_NON_ESSENTIAL = \
+RD_DRVS = \
+        infrastructure/root \
         infrastructure/rootvirt \
         fb/kfb \
@@ -167 +165 @@
         $(USPACE_PATH)/app/dltest2/dltest2 \
         $(USPACE_PATH)/app/dload/dload \
-        $(USPACE_PATH)/app/dplay/dplay \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/inet/inet \
@@ -173 +170 @@
         $(USPACE_PATH)/app/killall/killall \
         $(USPACE_PATH)/app/loc/loc \
-        $(USPACE_PATH)/app/mixerctl/mixerctl \
         $(USPACE_PATH)/app/logset/logset \
         $(USPACE_PATH)/app/mkfat/mkfat \
@@ -236 +232 @@
 RD_SRVS = $(RD_SRVS_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL)
-RD_DRVS = $(RD_DRVS_ESSENTIAL)
 else
 RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
 RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
-RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTAIL)
 endif
 

boot/arch/amd64/Makefile.inc

@@ -28 +28 @@
 
 RD_SRVS_ESSENTIAL += \
-        $(USPACE_PATH)/srv/audio/hound/hound \
-        $(USPACE_PATH)/srv/devman/devman \
         $(USPACE_PATH)/srv/hw/irc/apic/apic \
         $(USPACE_PATH)/srv/hw/irc/i8259/i8259
@@ -36 +34 @@
         $(USPACE_PATH)/srv/bd/ata_bd/ata_bd
 
-RD_DRVS_ESSENTIAL += \
+RD_DRVS += \
         infrastructure/rootpc \
         bus/pci/pciintel \
         bus/isa \
-        audio/sb16 \
         char/i8042 \
+        char/ns8250 \
         char/ps2mouse \
-        char/xtkbd
-
-RD_DRVS_NON_ESSENTIAL += \
-        char/ns8250 \
+        char/xtkbd \
         time/cmos-rtc \
         bus/usb/ehci\
@@ -62 +57 @@
         bus/isa
 
-RD_APPS_ESSENTIAL += \
-        $(USPACE_PATH)/app/edit/edit \
-        $(USPACE_PATH)/app/mixerctl/mixerctl \
-        $(USPACE_PATH)/app/wavplay/wavplay \
-        
 BOOT_OUTPUT = $(ROOT_PATH)/image.iso
 PREBUILD = $(INITRD).img

defaults/amd64/Makefile.config

@@ -25 +25 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
-
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
 
 # Kernel symbol information

defaults/arm32/Makefile.config

@@ -16 +16 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
-
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
 
 # Kernel symbol information

defaults/ia32/Makefile.config

@@ -31 +31 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
-
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
 
 # Kernel symbol information

defaults/ia64/Makefile.config

@@ -29 +29 @@
 CONFIG_KCONSOLE = y
 
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
-
 # Kernel symbol information
 CONFIG_SYMTAB = y

defaults/mips32/Makefile.config

@@ -22 +22 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
-
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
 
 # Kernel symbol information

defaults/mips64/Makefile.config

@@ -22 +22 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
-
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
 
 # Kernel symbol information

defaults/ppc32/Makefile.config

@@ -16 +16 @@
 # Kernel console support
 CONFIG_KCONSOLE = y
-
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
 
 # Kernel symbol information

defaults/sparc64/Makefile.config

@@ -32 +32 @@
 CONFIG_KCONSOLE = y
 
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
-
 # Kernel symbol information
 CONFIG_SYMTAB = y

defaults/special/Makefile.config

@@ -17 +17 @@
 CONFIG_KCONSOLE = y
 
-# Number of shell consoles
-CONFIG_VC_COUNT = 5
-
 # Kernel symbol information
 CONFIG_SYMTAB = y

uspace/Makefile

@@ -39 +39 @@
         app/bnchmark \
         app/devctl \
-        app/drec \
         app/edit \
         app/getterm \
@@ -48 +47 @@
         app/klog \
         app/loc \
-        app/mixerctl \
         app/logset \
         app/mkfat \
@@ -74 +72 @@
         app/sysinfo \
         app/mkbd \
-        app/wavplay \
         app/date \
         app/websrv \
-        srv/audio/hound \
         app/vdemo \
         app/vlaunch \
@@ -117 +113 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        drv/audio/sb16 \
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
@@ -216 +211 @@
         lib/softfloat \
         lib/drv \
-        lib/hound \
         lib/graph \
         lib/gui \
@@ -229 +223 @@
         lib/usbhid \
         lib/usbvirt \
-        lib/pcm \
         lib/bithenge \
         lib/posix

uspace/Makefile.common

@@ -127 +127 @@
 
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
-LIBHOUND_PREFIX = $(LIB_PREFIX)/hound
-LIBPCM_PREFIX = $(LIB_PREFIX)/pcm
 LIBNET_PREFIX = $(LIB_PREFIX)/net
 LIBNIC_PREFIX = $(LIB_PREFIX)/nic
@@ -258 +256 @@
 
 ifneq ($(BINARY),)
-%.disasm: $(BINARY)_prestrip
+%.disasm: $(BINARY)
 ifeq ($(CONFIG_LINE_DEBUG),y)
         $(OBJDUMP) -d -S $< > $@
@@ -265 +263 @@
 endif
 
-.INTERMEDIATE: $(BINARY)_prestrip
-
-$(BINARY)_prestrip: $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $@ $(OBJECTS) $(LIBS) $(BASE_LIBS)
-
-$(BINARY): $(BINARY)_prestrip $(BINARY).disasm
-        cp $(BINARY)_prestrip $@
+$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)

uspace/app/init/init.c

@@ -382 +382 @@
 #endif
         
-        srv_start("/srv/hound");
         srv_start("/srv/input", HID_INPUT);
         srv_start("/srv/output", HID_OUTPUT);
@@ -393 +392 @@
                 rc = console(HID_INPUT, HID_OUTPUT);
                 if (rc == EOK) {
-                        switch((unsigned)CONFIG_VC_COUNT) {
-                        default:
-                        case 6: getterm("term/vc5", "/app/bdsh", false);
-                        case 5: getterm("term/vc4", "/app/bdsh", false);
-                        case 4: getterm("term/vc3", "/app/bdsh", false);
-                        case 3: getterm("term/vc2", "/app/bdsh", false);
-                        case 2: getterm("term/vc1", "/app/bdsh", false);
-                        case 1: getterm("term/vc0", "/app/bdsh", true);
-                        }
-#ifdef CONFIG_KERNEL_LOG_VC_6
+                        getterm("term/vc0", "/app/bdsh", true);
+                        getterm("term/vc1", "/app/bdsh", false);
+                        getterm("term/vc2", "/app/bdsh", false);
+                        getterm("term/vc3", "/app/bdsh", false);
+                        getterm("term/vc4", "/app/bdsh", false);
+                        getterm("term/vc5", "/app/bdsh", false);
                         getterm("term/vc6", "/app/klog", false);
-#endif
                 }
         }

uspace/drv/bus/isa/i8237.c

@@ -38 +38 @@
 #include <stdbool.h>
 #include <errno.h>
-#include <ddi.h>
-#include <ddf/log.h>
 #include <fibril_synch.h>
 #include <ddi.h>
@@ -200 +198 @@
         .channels = {
                 /* The first chip 8-bit */
-                { /* Channel 0 - Unusable*/
-                        .offset_reg_address = (uint8_t *) 0x00,
-                        .size_reg_address = (uint8_t *) 0x01,
-                        .page_reg_address = (uint8_t *) 0x87,
-                        .single_mask_address = (uint8_t *) 0x0a,
-                        .mode_address = (uint8_t *) 0x0b,
-                        .flip_flop_address = (uint8_t *) 0x0c,
-                },
-                { /* Channel 1 */
-                        .offset_reg_address = (uint8_t *) 0x02,
-                        .size_reg_address = (uint8_t *) 0x03,
-                        .page_reg_address = (uint8_t *) 0x83,
-                        .single_mask_address = (uint8_t *) 0x0a,
-                        .mode_address = (uint8_t *) 0x0b,
-                        .flip_flop_address = (uint8_t *) 0x0c,
-                },
-                { /* Channel 2 */
-                        .offset_reg_address = (uint8_t *) 0x04,
-                        .size_reg_address = (uint8_t *) 0x05,
-                        .page_reg_address = (uint8_t *) 0x81,
-                        .single_mask_address = (uint8_t *) 0x0a,
-                        .mode_address = (uint8_t *) 0x0b,
-                        .flip_flop_address = (uint8_t *) 0x0c,
-                },
-                { /* Channel 3 */
-                        .offset_reg_address = (uint8_t *) 0x06,
-                        .size_reg_address = (uint8_t *) 0x07,
-                        .page_reg_address = (uint8_t *) 0x82,
-                        .single_mask_address = (uint8_t *) 0x0a,
-                        .mode_address = (uint8_t *) 0x0b,
-                        .flip_flop_address = (uint8_t *) 0x0c,
+                {
+                        (uint8_t *) 0x00,
+                        (uint8_t *) 0x01,
+                        (uint8_t *) 0x87,
+                        (uint8_t *) 0x0a,
+                        (uint8_t *) 0x0b,
+                        (uint8_t *) 0x0c,
+                },
+                {
+                        (uint8_t *) 0x02,
+                        (uint8_t *) 0x03,
+                        (uint8_t *) 0x83,
+                        (uint8_t *) 0x0a,
+                        (uint8_t *) 0x0b,
+                        (uint8_t *) 0x0c,
+                },
+                {
+                        (uint8_t *) 0x04,
+                        (uint8_t *) 0x05,
+                        (uint8_t *) 0x81,
+                        (uint8_t *) 0x0a,
+                        (uint8_t *) 0x0b,
+                        (uint8_t *) 0x0c,
+                },
+                {
+                        (uint8_t *) 0x06,
+                        (uint8_t *) 0x07,
+                        (uint8_t *) 0x82,
+                        (uint8_t *) 0x0a,
+                        (uint8_t *) 0x0b,
+                        (uint8_t *) 0x0c,
                 },
                 
                 /* The second chip 16-bit */
-                { /* Channel 4 - Unusable */
-                        .offset_reg_address = (uint8_t *) 0xc0,
-                        .size_reg_address = (uint8_t *) 0xc2,
-                        .page_reg_address = (uint8_t *) 0x8f,
-                        .single_mask_address = (uint8_t *) 0xd4,
-                        .mode_address = (uint8_t *) 0xd6,
-                        .flip_flop_address = (uint8_t *) 0xd8,
-                },
-                { /* Channel 5 */
-                        .offset_reg_address = (uint8_t *) 0xc4,
-                        .size_reg_address = (uint8_t *) 0xc6,
-                        .page_reg_address = (uint8_t *) 0x8b,
-                        .single_mask_address = (uint8_t *) 0xd4,
-                        .mode_address = (uint8_t *) 0xd6,
-                        .flip_flop_address = (uint8_t *) 0xd8,
-                },
-                { /* Channel 6 */
-                        .offset_reg_address = (uint8_t *) 0xc8,
-                        .size_reg_address = (uint8_t *) 0xca,
-                        .page_reg_address = (uint8_t *) 0x89,
-                        .single_mask_address = (uint8_t *) 0xd4,
-                        .mode_address = (uint8_t *) 0xd6,
-                        .flip_flop_address = (uint8_t *) 0xd8,
-                },
-                { /* Channel 7 */
-                        .offset_reg_address = (uint8_t *) 0xcc,
-                        .size_reg_address = (uint8_t *) 0xce,
-                        .page_reg_address = (uint8_t *) 0x8a,
-                        .single_mask_address = (uint8_t *) 0xd4,
-                        .mode_address = (uint8_t *) 0xd6,
-                        .flip_flop_address = (uint8_t *) 0xd8,
+                {
+                        (uint8_t *) 0xc0,
+                        (uint8_t *) 0xc2,
+                        (uint8_t *) 0x8f,
+                        (uint8_t *) 0xd4,
+                        (uint8_t *) 0xd6,
+                        (uint8_t *) 0xd8,
+                },
+                {
+                        (uint8_t *) 0xc4,
+                        (uint8_t *) 0xc6,
+                        (uint8_t *) 0x8b,
+                        (uint8_t *) 0xd4,
+                        (uint8_t *) 0xd6,
+                        (uint8_t *) 0xd8,
+                },
+                {
+                        (uint8_t *) 0xc8,
+                        (uint8_t *) 0xca,
+                        (uint8_t *) 0x89,
+                        (uint8_t *) 0xd4,
+                        (uint8_t *) 0xd6,
+                        (uint8_t *) 0xd8,
+                },
+                {
+                        (uint8_t *) 0xcc,
+                        (uint8_t *) 0xce,
+                        (uint8_t *) 0x8a,
+                        (uint8_t *) 0xd4,
+                        (uint8_t *) 0xd6,
+                        (uint8_t *) 0xd8,
                 },
         },
@@ -274 +272 @@
 };
 
-/** Initialize I/O access to DMA controller I/O ports.
+/* Initialize I/O access to DMA controller I/O ports.
  *
  * @param controller DMA Controller structure to initialize.
  *
  * @return Error code.
+ *
  */
 static inline int dma_controller_init(dma_controller_t *controller)
@@ -305 +304 @@
         
         return EOK;
-}
-
-/** Helper function. Channels 4,5,6, and 7 are 8 bit DMA.
- * @pram channel DMA channel.
- * @reutrn True, if channel is 4,5,6, or 7, false otherwise.
- */
-static inline bool is_dma16(unsigned channel)
-{
-        return (channel >= 4) && (channel < 8);
-}
-
-/** Helper function. Channels 0,1,2, and 3 are 8 bit DMA.
- * @pram channel DMA channel.
- * @reutrn True, if channel is 0,1,2, or 3, false otherwise.
- */
-static inline bool is_dma8(unsigned channel)
-{
-        return (channel < 4);
 }
 
@@ -339 +320 @@
  *
  * @return Error code.
- */
-int dma_channel_setup(unsigned int channel, uint32_t pa, uint16_t size,
+ *
+ */
+int dma_setup_channel(unsigned int channel, uint32_t pa, uint16_t size,
     uint8_t mode)
 {
-        if (!is_dma8(channel) && !is_dma16(channel))
-                return ENOENT;
-
         if ((channel == 0) || (channel == 4))
                 return ENOTSUP;
+        
+        if (channel > 7)
+                return ENOENT;
         
         /* DMA is limited to 24bit addresses. */
@@ -354 +336 @@
         
         /* 8 bit channels use only 4 bits from the page register. */
-        if (is_dma8(channel) && (pa >= (1 << 20)))
-                return EINVAL;
-
-        /* Buffers cannot cross 64K page boundaries */
-        if ((pa & 0xffff0000) !=  ((pa + size) & 0xffff0000))
+        if ((channel > 0) && (channel < 4) && (pa >= (1 << 20)))
                 return EINVAL;
         
@@ -374 +352 @@
         ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu16 ")",
             pa, size);
-        if (is_dma16(channel)) {
+        if (channel > 4) {
                 /* Size must be aligned to 16 bits */
                 if ((size & 1) != 0) {
@@ -380 +358 @@
                         return EINVAL;
                 }
-                /* Size is in 2byte words */
+                
                 size >>= 1;
+                
                 /* Address is fun: lower 16 bits need to be shifted by 1 */
                 pa = ((pa & 0xffff) >> 1) | (pa & 0xff0000);
@@ -447 +426 @@
 }
 
-/** Query remaining buffer size.
- *
- * @param channel DMA Channel 1, 2, 3 for 8 bit transfers,
- *                    5, 6, 7 for 16 bit.
- * @param size    Place to store number of bytes pending in the assigned buffer.
- *
- * @return Error code.
- */
-int dma_channel_remain(unsigned channel, size_t *size)
-{
-        assert(size);
-        if (!is_dma8(channel) && !is_dma16(channel))
-                return ENOENT;
-        
-        if ((channel == 0) || (channel == 4))
-                return ENOTSUP;
-        
-        fibril_mutex_lock(&guard);
-        if (!controller_8237.initialized) {
-                fibril_mutex_unlock(&guard);
-                return EIO;
-        }
-
-        const dma_channel_t dma_channel = controller_8237.channels[channel];
-        /* Get size - reset flip-flop */
-        pio_write_8(dma_channel.flip_flop_address, 0);
-        
-        /* Low byte */
-        const uint8_t value_low = pio_read_8(dma_channel.size_reg_address);
-        ddf_msg(LVL_DEBUG2, "Read size low byte: %p:%zx.",
-            dma_channel.size_reg_address, value_low);
-        
-        /* High byte */
-        const uint8_t value_high = pio_read_8(dma_channel.size_reg_address);
-        ddf_msg(LVL_DEBUG2, "Read size high byte: %p:%zx.",
-            dma_channel.size_reg_address, value_high);
-        fibril_mutex_unlock(&guard);
-
-        uint16_t remain = (value_high << 8 | value_low) ;
-        /* 16 bit DMA size is in words,
-         * the upper bits are bogus for 16bit transfers so we need to get
-         * rid of them. Using limited type works well.*/
-        if (is_dma16(channel))
-                remain <<= 1;
-        *size =  is_dma16(channel) ? remain + 2: remain + 1;
-        return EOK;
-}
 /**
  * @}

uspace/drv/bus/isa/i8237.h

@@ -38 +38 @@
 #define DRV_BUS_ISA_I8237_H
 
-extern int dma_channel_setup(unsigned, uint32_t, uint16_t, uint8_t);
-extern int dma_channel_remain(unsigned, size_t *);
+extern int dma_setup_channel(unsigned int, uint32_t, uint16_t, uint8_t);
 
 #endif

uspace/drv/bus/isa/isa.c

@@ -85 +85 @@
         fibril_mutex_t mutex;
         ddf_fun_t *fnode;
-        hw_resource_t resources[ISA_MAX_HW_RES];
         hw_resource_list_t hw_resources;
         link_t bus_link;
@@ -104 +103 @@
 static hw_resource_list_t *isa_get_fun_resources(ddf_fun_t *fnode)
 {
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
-
-        return &isa->hw_resources;
-}
-
-static bool isa_fun_enable_interrupt(ddf_fun_t *fnode)
+        isa_fun_t *fun = isa_fun(fnode);
+        assert(fun != NULL);
+
+        return &fun->hw_resources;
+}
+
+static bool isa_enable_fun_interrupt(ddf_fun_t *fnode)
 {
         /* This is an old ugly way, copied from pci driver */
         assert(fnode);
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
+        isa_fun_t *fun = isa_fun(fnode);
 
         sysarg_t apic;
@@ -131 +129 @@
                 return false;
 
-        const hw_resource_list_t *res = &isa->hw_resources;
+        const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
         for (size_t i = 0; i < res->count; ++i) {
@@ -153 +151 @@
 }
 
-static int isa_fun_setup_dma(ddf_fun_t *fnode,
+static int isa_dma_channel_fun_setup(ddf_fun_t *fnode,
     unsigned int channel, uint32_t pa, uint16_t size, uint8_t mode)
 {
         assert(fnode);
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
-        const hw_resource_list_t *res = &isa->hw_resources;
+        isa_fun_t *fun = isa_fun(fnode);
+        const hw_resource_list_t *res = &fun->hw_resources;
         assert(res);
-
+        
+        const unsigned int ch = channel;
         for (size_t i = 0; i < res->count; ++i) {
-                /* Check for assigned channel */
                 if (((res->resources[i].type == DMA_CHANNEL_16) &&
-                    (res->resources[i].res.dma_channel.dma16 == channel)) ||
+                    (res->resources[i].res.dma_channel.dma16 == ch)) ||
                     ((res->resources[i].type == DMA_CHANNEL_8) &&
-                    (res->resources[i].res.dma_channel.dma8 == channel))) {
-                        return dma_channel_setup(channel, pa, size, mode);
+                    (res->resources[i].res.dma_channel.dma8 == ch))) {
+                        return dma_setup_channel(channel, pa, size, mode);
                 }
         }
-
-        return EINVAL;
-}
-
-static int isa_fun_remain_dma(ddf_fun_t *fnode,
-    unsigned channel, size_t *size)
-{
-        assert(size);
-        assert(fnode);
-        isa_fun_t *isa = isa_fun(fnode);
-        assert(isa);
-        const hw_resource_list_t *res = &isa->hw_resources;
-        assert(res);
-
-        for (size_t i = 0; i < res->count; ++i) {
-                /* Check for assigned channel */
-                if (((res->resources[i].type == DMA_CHANNEL_16) &&
-                    (res->resources[i].res.dma_channel.dma16 == channel)) ||
-                    ((res->resources[i].type == DMA_CHANNEL_8) &&
-                    (res->resources[i].res.dma_channel.dma8 == channel))) {
-                        return dma_channel_remain(channel, size);
-                }
-        }
-
+        
         return EINVAL;
 }
@@ -200 +174 @@
 static hw_res_ops_t isa_fun_hw_res_ops = {
         .get_resource_list = isa_get_fun_resources,
-        .enable_interrupt = isa_fun_enable_interrupt,
-        .dma_channel_setup = isa_fun_setup_dma,
-        .dma_channel_remain = isa_fun_remain_dma,
+        .enable_interrupt = isa_enable_fun_interrupt,
+        .dma_channel_setup = isa_dma_channel_fun_setup,
 };
 
-static ddf_dev_ops_t isa_fun_ops= {
-        .interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops,
-};
+static ddf_dev_ops_t isa_fun_ops;
 
 static int isa_dev_add(ddf_dev_t *dev);
@@ -241 +212 @@
 
         fibril_mutex_initialize(&fun->mutex);
-        fun->hw_resources.resources = fun->resources;
-
         fun->fnode = fnode;
         return fun;
@@ -301 +270 @@
 {
         char *line = str;
-        *next = NULL;
 
         if (str == NULL) {
+                *next = NULL;
                 return NULL;
         }
@@ -313 +282 @@
         if (*str != '\0') {
                 *next = str + 1;
+        } else {
+                *next = NULL;
         }
 
@@ -339 +310 @@
         /* Get the name part of the rest of the line. */
         strtok(line, ":");
-        return line;
-}
-
-static inline const char *skip_spaces(const char *line)
+
+        /* Allocate output buffer. */
+        size_t size = str_size(line) + 1;
+        char *name = malloc(size);
+
+        if (name != NULL) {
+                /* Copy the result to the output buffer. */
+                str_cpy(name, size, line);
+        }
+
+        return name;
+}
+
+static inline char *skip_spaces(char *line)
 {
         /* Skip leading spaces. */
@@ -351 +332 @@
 }
 
-static void isa_fun_add_irq(isa_fun_t *fun, int irq)
+static void isa_fun_set_irq(isa_fun_t *fun, int irq)
 {
         size_t count = fun->hw_resources.count;
@@ -367 +348 @@
 }
 
-static void isa_fun_add_dma(isa_fun_t *fun, int dma)
+static void isa_fun_set_dma(isa_fun_t *fun, int dma)
 {
         size_t count = fun->hw_resources.count;
@@ -400 +381 @@
 }
 
-static void isa_fun_add_io_range(isa_fun_t *fun, size_t addr, size_t len)
+static void isa_fun_set_io_range(isa_fun_t *fun, size_t addr, size_t len)
 {
         size_t count = fun->hw_resources.count;
@@ -419 +400 @@
 }
 
-static void fun_parse_irq(isa_fun_t *fun, const char *val)
+static void fun_parse_irq(isa_fun_t *fun, char *val)
 {
         int irq = 0;
@@ -428 +409 @@
 
         if (val != end)
-                isa_fun_add_irq(fun, irq);
-}
-
-static void fun_parse_dma(isa_fun_t *fun, const char *val)
-{
+                isa_fun_set_irq(fun, irq);
+}
+
+static void fun_parse_dma(isa_fun_t *fun, char *val)
+{
+        unsigned int dma = 0;
         char *end = NULL;
         
         val = skip_spaces(val);
-        const int dma = strtol(val, &end, 10);
+        dma = (unsigned int) strtol(val, &end, 10);
         
         if (val != end)
-                isa_fun_add_dma(fun, dma);
-}
-
-static void fun_parse_io_range(isa_fun_t *fun, const char *val)
+                isa_fun_set_dma(fun, dma);
+}
+
+static void fun_parse_io_range(isa_fun_t *fun, char *val)
 {
         size_t addr, len;
@@ -459 +441 @@
                 return;
 
-        isa_fun_add_io_range(fun, addr, len);
-}
-
-static void get_match_id(char **id, const char *val)
-{
-        const char *end = val;
+        isa_fun_set_io_range(fun, addr, len);
+}
+
+static void get_match_id(char **id, char *val)
+{
+        char *end = val;
 
         while (!isspace(*end))
@@ -474 +456 @@
 }
 
-static void fun_parse_match_id(isa_fun_t *fun, const char *val)
+static void fun_parse_match_id(isa_fun_t *fun, char *val)
 {
         char *id = NULL;
+        int score = 0;
         char *end = NULL;
+        int rc;
 
         val = skip_spaces(val);
 
-        int score = (int)strtol(val, &end, 10);
+        score = (int)strtol(val, &end, 10);
         if (val == end) {
                 ddf_msg(LVL_ERROR, "Cannot read match score for function "
@@ -499 +483 @@
             "function %s", id, score, ddf_fun_get_name(fun->fnode));
 
-        int rc = ddf_fun_add_match_id(fun->fnode, id, score);
+        rc = ddf_fun_add_match_id(fun->fnode, id, score);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed adding match ID: %s",
@@ -508 +492 @@
 }
 
-static bool prop_parse(isa_fun_t *fun, const char *line, const char *prop,
-    void (*read_fn)(isa_fun_t *, const char *))
+static bool prop_parse(isa_fun_t *fun, char *line, const char *prop,
+    void (*read_fn)(isa_fun_t *, char *))
 {
         size_t proplen = str_size(prop);
@@ -524 +508 @@
 }
 
-static void fun_prop_parse(isa_fun_t *fun, const char *line)
+static void fun_prop_parse(isa_fun_t *fun, char *line)
 {
         /* Skip leading spaces. */
@@ -539 +523 @@
 }
 
+static void fun_hw_res_alloc(isa_fun_t *fun)
+{
+        fun->hw_resources.resources =
+            (hw_resource_t *) malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
+}
+
+static void fun_hw_res_free(isa_fun_t *fun)
+{
+        free(fun->hw_resources.resources);
+        fun->hw_resources.resources = NULL;
+}
+
 static char *isa_fun_read_info(char *fun_conf, isa_bus_t *isa)
 {
         char *line;
+        char *fun_name = NULL;
 
         /* Skip empty lines. */
-        do {
+        while (true) {
                 line = str_get_line(fun_conf, &fun_conf);
 
@@ -552 +549 @@
                 }
 
-        } while (line_empty(line));
+                if (!line_empty(line))
+                        break;
+        }
 
         /* Get device name. */
-        const char *fun_name = get_device_name(line);
+        fun_name = get_device_name(line);
         if (fun_name == NULL)
                 return NULL;
 
         isa_fun_t *fun = isa_fun_create(isa, fun_name);
+        free(fun_name);
         if (fun == NULL) {
                 return NULL;
         }
+
+        /* Allocate buffer for the list of hardware resources of the device. */
+        fun_hw_res_alloc(fun);
 
         /* Get properties of the device (match ids, irq and io range). */
@@ -593 +596 @@
 }
 
-static void isa_functions_add(isa_bus_t *isa)
-{
-        char *conf = fun_conf_read(CHILD_FUN_CONF_PATH);
+static void fun_conf_parse(char *conf, isa_bus_t *isa)
+{
         while (conf != NULL && *conf != '\0') {
                 conf = isa_fun_read_info(conf, isa);
         }
-        free(conf);
+}
+
+static void isa_functions_add(isa_bus_t *isa)
+{
+        char *fun_conf;
+
+        fun_conf = fun_conf_read(CHILD_FUN_CONF_PATH);
+        if (fun_conf != NULL) {
+                fun_conf_parse(fun_conf, isa);
+                free(fun_conf);
+        }
 }
 
 static int isa_dev_add(ddf_dev_t *dev)
 {
+        isa_bus_t *isa;
+
         ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d",
             (int) ddf_dev_get_handle(dev));
 
-        isa_bus_t *isa = ddf_dev_data_alloc(dev, sizeof(isa_bus_t));
+        isa = ddf_dev_data_alloc(dev, sizeof(isa_bus_t));
         if (isa == NULL)
                 return ENOMEM;
@@ -644 +658 @@
 {
         isa_bus_t *isa = isa_bus(dev);
+        int rc;
 
         fibril_mutex_lock(&isa->mutex);
@@ -651 +666 @@
                     isa_fun_t, bus_link);
 
-                int rc = ddf_fun_offline(fun->fnode);
+                rc = ddf_fun_offline(fun->fnode);
                 if (rc != EOK) {
                         fibril_mutex_unlock(&isa->mutex);
@@ -667 +682 @@
                 list_remove(&fun->bus_link);
 
+                fun_hw_res_free(fun);
                 ddf_fun_destroy(fun->fnode);
         }
@@ -693 +709 @@
 }
 
+
+static void isa_init()
+{
+        ddf_log_init(NAME);
+        isa_fun_ops.interfaces[HW_RES_DEV_IFACE] = &isa_fun_hw_res_ops;
+}
+
 int main(int argc, char *argv[])
 {
         printf(NAME ": HelenOS ISA bus driver\n");
-        ddf_log_init(NAME);
+        isa_init();
         return ddf_driver_main(&isa_driver);
 }

uspace/lib/c/generic/device/hw_res.c

@@ -42 +42 @@
 {
         sysarg_t count = 0;
-
+        
         async_exch_t *exch = async_exchange_begin(sess);
-        if (exch == NULL)
-                return ENOMEM;
         int rc = async_req_1_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_GET_RESOURCE_LIST, &count);
-
+        
         if (rc != EOK) {
                 async_exchange_end(exch);
                 return rc;
         }
-
+        
         size_t size = count * sizeof(hw_resource_t);
         hw_resource_t *resources = (hw_resource_t *) malloc(size);
@@ -61 +59 @@
                 return ENOMEM;
         }
-
+        
         rc = async_data_read_start(exch, resources, size);
         async_exchange_end(exch);
-
+        
         if (rc != EOK) {
                 free(resources);
                 return rc;
         }
-
+        
         hw_resources->resources = resources;
         hw_resources->count = count;
-
+        
         return EOK;
 }
@@ -79 +77 @@
 {
         async_exch_t *exch = async_exchange_begin(sess);
-        if (exch == NULL)
-                return false;
         int rc = async_req_1_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
             HW_RES_ENABLE_INTERRUPT);
         async_exchange_end(exch);
-
+        
         return (rc == EOK);
-}
-
-/**
- * Setup DMA channel to specified place and mode.
- * @param channel DMA Channel 1,2,3 for 8 bit transfers, 5,6,7 for 16 bit.
- * @param pa Physical address of the buffer. Must be < 16MB for 16 bit and < 1MB
- *           for 8 bit transfers.
- * @param size DMA buffer size, limited to 64K.
- * @param mode Mode of the DMA channel:
- *              - Read or Write
- *              - Allow automatic reset
- *              - Use address decrement instead of increment
- *              - Use SINGLE/BLOCK/ON DEMAND transfer mode
- * @return Error code.
- */
-int hw_res_dma_channel_setup(async_sess_t *sess,
-    unsigned channel, uint32_t pa, uint16_t size, uint8_t mode)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        if (exch == NULL)
-                return ENOMEM;
-        const uint32_t packed = size | (mode << 16);
-        const int ret = async_req_4_0(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
-            HW_RES_DMA_CHANNEL_SETUP, channel, pa, packed);
-        async_exchange_end(exch);
-
-        return ret;
-}
-
-/**
- * Query remaining bytes in the buffer.
- * @param channel DMA Channel 1,2,3 for 8 bit transfers, 5,6,7 for 16 bit.
- * @return Number of bytes remaining in the buffer(>=0) or error code(<0).
- */
-int hw_res_dma_channel_remain(async_sess_t *sess, unsigned channel)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        if (exch == NULL)
-                return ENOMEM;
-        sysarg_t remain;
-        const int ret = async_req_2_1(exch, DEV_IFACE_ID(HW_RES_DEV_IFACE),
-            HW_RES_DMA_CHANNEL_REMAIN, channel, &remain);
-        async_exchange_end(exch);
-        if (ret == EOK)
-                return remain;
-        return ret;
 }
 

uspace/lib/c/generic/device/hw_res_parsed.c

@@ -38 +38 @@
 #include <errno.h>
 
-static void hw_res_parse_add_dma_channel(hw_res_list_parsed_t *out,
-    const hw_resource_t *res, int flags)
-{
-        assert(res);
-        assert((res->type == DMA_CHANNEL_8) || (res->type == DMA_CHANNEL_16));
-        
-        const unsigned channel = (res->type == DMA_CHANNEL_8) ?
-            res->res.dma_channel.dma8 : res->res.dma_channel.dma16;
-        const size_t count = out->dma_channels.count;
-        const int keep_duplicit = flags & HW_RES_KEEP_DUPLICIT;
-        
-        if (!keep_duplicit) {
-                for (size_t i = 0; i < count; ++i) {
-                        if (out->dma_channels.channels[i] == channel)
-                                return;
-                }
-        }
-        
-        out->dma_channels.channels[count] = channel;
-        ++out->dma_channels.count;
-}
-
-static void hw_res_parse_add_irq(hw_res_list_parsed_t *out,
-    const hw_resource_t *res, int flags)
+static void hw_res_parse_add_irq(hw_res_list_parsed_t *out, hw_resource_t *res,
+    int flags)
 {
         assert(res && (res->type == INTERRUPT));
@@ -81 +59 @@
 
 static void hw_res_parse_add_io_range(hw_res_list_parsed_t *out,
-    const hw_resource_t *res, int flags)
+    hw_resource_t *res, int flags)
 {
         assert(res && (res->type == IO_RANGE));
@@ -112 +90 @@
 
 static void hw_res_parse_add_mem_range(hw_res_list_parsed_t *out,
-    const hw_resource_t *res, int flags)
+    hw_resource_t *res, int flags)
 {
         assert(res && (res->type == MEM_RANGE));
@@ -154 +132 @@
  *
  */
-int hw_res_list_parse(const hw_resource_list_t *hw_resources,
+int hw_res_list_parse(hw_resource_list_t *hw_resources,
     hw_res_list_parsed_t *out, int flags)
 {
@@ -163 +141 @@
         hw_res_list_parsed_clean(out);
         
-        out->irqs.irqs = calloc(res_count, sizeof(int));
-        out->dma_channels.channels = calloc(res_count, sizeof(int));
-        out->io_ranges.ranges = calloc(res_count, sizeof(io_range_t));
-        out->mem_ranges.ranges = calloc(res_count, sizeof(mem_range_t));
-        if (!out->irqs.irqs || !out->dma_channels.channels ||
-            !out->io_ranges.ranges || !out->mem_ranges.ranges) {
-                hw_res_list_parsed_clean(out);
-                return ENOMEM;
-        }
+        out->irqs.irqs = malloc(res_count * sizeof(int));
+        out->io_ranges.ranges = malloc(res_count * sizeof(io_range_t));
+        out->mem_ranges.ranges = malloc(res_count * sizeof(mem_range_t));
         
         for (size_t i = 0; i < res_count; ++i) {
-                const hw_resource_t *resource = &(hw_resources->resources[i]);
-
+                hw_resource_t *resource = &(hw_resources->resources[i]);
+                
                 switch (resource->type) {
                 case INTERRUPT:
@@ -186 +158 @@
                         hw_res_parse_add_mem_range(out, resource, flags);
                         break;
-                case DMA_CHANNEL_8:
-                case DMA_CHANNEL_16:
-                        hw_res_parse_add_dma_channel(out, resource, flags);
-                        break;
                 default:
-                        hw_res_list_parsed_clean(out);
                         return EINVAL;
                 }
         }
-
+        
         return EOK;
 };

uspace/lib/c/include/device/hw_res.h

@@ -53 +53 @@
         HW_RES_ENABLE_INTERRUPT,
         HW_RES_DMA_CHANNEL_SETUP,
-        HW_RES_DMA_CHANNEL_REMAIN,
 } hw_res_method_t;
 
@@ -117 +116 @@
 extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
     uint16_t, uint8_t);
-extern int hw_res_dma_channel_remain(async_sess_t *, unsigned);
 
 #endif

uspace/lib/c/include/device/hw_res_parsed.h

@@ -139 +139 @@
 }
 
-extern int hw_res_list_parse(
-    const hw_resource_list_t *, hw_res_list_parsed_t *, int);
+extern int hw_res_list_parse(hw_resource_list_t *, hw_res_list_parsed_t *, int);
 extern int hw_res_get_list_parsed(async_sess_t *, hw_res_list_parsed_t *, int);
 

uspace/lib/c/include/ipc/dev_iface.h

@@ -36 +36 @@
 typedef enum {
         HW_RES_DEV_IFACE = 0,
-
-        /** Audio device mixer interface */
-        AUDIO_MIXER_IFACE,
-        /** Audio device pcm buffer interface */
-        AUDIO_PCM_BUFFER_IFACE,
-
         /** Character device interface */
         CHAR_DEV_IFACE,

uspace/lib/drv/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-EXTRA_CFLAGS = -Iinclude -I$(LIBUSB_PREFIX)/include -I$(LIBPCM_PREFIX)/include
+EXTRA_CFLAGS = -Iinclude -I$(LIBUSB_PREFIX)/include
 LIBRARY = libdrv
 
@@ -38 +38 @@
         generic/log.c \
         generic/logbuf.c \
-        generic/remote_audio_mixer.c \
-        generic/remote_audio_pcm.c \
         generic/remote_hw_res.c \
         generic/remote_char_dev.c \

uspace/lib/drv/generic/dev_iface.c

@@ -49 +49 @@
 #include "remote_usbhid.h"
 #include "remote_pci.h"
-#include "remote_audio_mixer.h"
-#include "remote_audio_pcm.h"
 #include "remote_ahci.h"
 
-static const iface_dipatch_table_t remote_ifaces = {
+static iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
-                [AUDIO_MIXER_IFACE] = &remote_audio_mixer_iface,
-                [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_iface,
-                [HW_RES_DEV_IFACE] = &remote_hw_res_iface,
-                [CHAR_DEV_IFACE] = &remote_char_dev_iface,
-                [GRAPH_DEV_IFACE] = &remote_graph_dev_iface,
-                [NIC_DEV_IFACE] = &remote_nic_iface,
-                [PCI_DEV_IFACE] = &remote_pci_iface,
-                [USB_DEV_IFACE] = &remote_usb_iface,
-                [USBHC_DEV_IFACE] = &remote_usbhc_iface,
-                [USBHID_DEV_IFACE] = &remote_usbhid_iface,
-                [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
-                [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
-                [AHCI_DEV_IFACE] = &remote_ahci_iface,
+                &remote_hw_res_iface,
+                &remote_char_dev_iface,
+                &remote_graph_dev_iface,
+                &remote_nic_iface,
+                &remote_pci_iface,
+                &remote_usb_iface,
+                &remote_usbhc_iface,
+                &remote_usbhid_iface,
+                &remote_clock_dev_iface,
+                &remote_battery_dev_iface,
+                &remote_ahci_iface
         }
 };

uspace/lib/drv/generic/remote_hw_res.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Lenka Trochtova
- * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -44 +43 @@
 static void remote_hw_res_enable_interrupt(ddf_fun_t *, void *, ipc_callid_t,
     ipc_call_t *);
-static void remote_hw_res_dma_channel_setup(ddf_fun_t *, void *, ipc_callid_t,
-    ipc_call_t *);
-static void remote_hw_res_dma_channel_remain(ddf_fun_t *, void *, ipc_callid_t,
-    ipc_call_t *);
 
 static remote_iface_func_ptr_t remote_hw_res_iface_ops [] = {
-        [HW_RES_GET_RESOURCE_LIST] = &remote_hw_res_get_resource_list,
-        [HW_RES_ENABLE_INTERRUPT] = &remote_hw_res_enable_interrupt,
-        [HW_RES_DMA_CHANNEL_SETUP] = &remote_hw_res_dma_channel_setup,
-        [HW_RES_DMA_CHANNEL_REMAIN] = &remote_hw_res_dma_channel_remain,
+        &remote_hw_res_get_resource_list,
+        &remote_hw_res_enable_interrupt
 };
 
@@ -101 +94 @@
 }
 
-static void remote_hw_res_dma_channel_setup(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        hw_res_ops_t *hw_res_ops = ops;
-
-        if (hw_res_ops->dma_channel_setup == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-        const unsigned channel = DEV_IPC_GET_ARG1(*call);
-        const uint32_t address = DEV_IPC_GET_ARG2(*call);
-        const uint16_t size = DEV_IPC_GET_ARG3(*call) & 0xffff;
-        const uint8_t mode = DEV_IPC_GET_ARG3(*call) >> 16;
-
-        const int ret = hw_res_ops->dma_channel_setup(
-            fun, channel, address, size, mode);
-        async_answer_0(callid, ret);
-}
-
-static void remote_hw_res_dma_channel_remain(ddf_fun_t *fun, void *ops,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        hw_res_ops_t *hw_res_ops = ops;
-
-        if (hw_res_ops->dma_channel_setup == NULL) {
-                async_answer_0(callid, ENOTSUP);
-                return;
-        }
-        const unsigned channel = DEV_IPC_GET_ARG1(*call);
-        size_t remain = 0;
-        const int ret = hw_res_ops->dma_channel_remain(fun, channel, &remain);
-        async_answer_1(callid, ret, remain);
-}
 /**
  * @}

uspace/lib/drv/include/ops/hw_res.h

@@ -45 +45 @@
         bool (*enable_interrupt)(ddf_fun_t *);
         int (*dma_channel_setup)(ddf_fun_t *, unsigned, uint32_t, uint16_t, uint8_t);
-        int (*dma_channel_remain)(ddf_fun_t *, unsigned, size_t *);
 } hw_res_ops_t;
 

uspace/srv/locsrv/locsrv.c

@@ -1377 +1377 @@
         categ_dir_add_cat(&cdir, cat);
         
-        cat = category_new("audio-pcm");
-        categ_dir_add_cat(&cdir, cat);
-        
         return true;
 }