Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

retire _PROTOTYPE

Browse Source 
. only good for obsolete K&R support
	. also remove a stray ansi.h and the proto cmd
This commit is contained in:
Ben Gras
2012-03-24 16:16:34 +01:00
parent cf720a028a
commit 6a73e85ad1
475 changed files with 5256 additions and 6252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/audio/es1370/ak4531.c
View File

@@ -26,10 +26,10 @@
#define MUTE 0x80
FORWARD _PROTOTYPE( int ak4531_write, (u8_t address, u8_t data) );
FORWARD _PROTOTYPE( int ak4531_finished, (void) );
FORWARD _PROTOTYPE( int set_volume, (struct volume_level *level,
int cmd_left, int cmd_right, int max_level) );
FORWARD int ak4531_write(u8_t address, u8_t data);
FORWARD int ak4531_finished(void);
FORWARD int set_volume(struct volume_level *level, int cmd_left, int
cmd_right, int max_level);
PRIVATE u16_t base_address;
PRIVATE u16_t status_register;

5
drivers/audio/es1370/ak4531.h
View File

@@ -5,8 +5,7 @@
#include <minix/drivers.h>
#include <minix/sound.h>
_PROTOTYPE( int ak4531_init, (u16_t base, u16_t status_reg, u16_t bit,
u16_t poll) );
_PROTOTYPE( int ak4531_get_set_volume, (struct volume_level *level, int flag) );
int ak4531_init(u16_t base, u16_t status_reg, u16_t bit, u16_t poll);
int ak4531_get_set_volume(struct volume_level *level, int flag);
#endif

30
drivers/audio/es1370/es1370.c
View File

@@ -28,22 +28,20 @@
/* prototypes of private functions */
FORWARD _PROTOTYPE( int detect_hw, (void) );
FORWARD _PROTOTYPE( int disable_int, (int sub_dev) );
FORWARD _PROTOTYPE( int set_stereo, (u32_t stereo, int sub_dev) );
FORWARD _PROTOTYPE( int set_bits, (u32_t nr_of_bits, int sub_dev) );
FORWARD _PROTOTYPE( int set_sample_rate, (u32_t rate, int sub_dev) );
FORWARD _PROTOTYPE( int set_sign, (u32_t val, int sub_dev) );
FORWARD _PROTOTYPE( int get_max_frag_size,
(u32_t * val, int *len, int sub_dev) );
FORWARD _PROTOTYPE( int set_frag_size, (u32_t fragment_size, int sub_dev) );
FORWARD _PROTOTYPE( int set_int_cnt, (int sub_dev) );
FORWARD _PROTOTYPE( int free_buf, (u32_t *val, int *len, int sub_dev) );
FORWARD _PROTOTYPE( int get_samples_in_buf,
(u32_t *val, int *len, int sub_dev) );
FORWARD _PROTOTYPE( int get_set_volume, (struct volume_level *level, int *len,
int sub_dev, int flag) );
FORWARD _PROTOTYPE( int reset, (int sub_dev) );
FORWARD int detect_hw(void);
FORWARD int disable_int(int sub_dev);
FORWARD int set_stereo(u32_t stereo, int sub_dev);
FORWARD int set_bits(u32_t nr_of_bits, int sub_dev);
FORWARD int set_sample_rate(u32_t rate, int sub_dev);
FORWARD int set_sign(u32_t val, int sub_dev);
FORWARD int get_max_frag_size(u32_t * val, int *len, int sub_dev);
FORWARD int set_frag_size(u32_t fragment_size, int sub_dev);
FORWARD int set_int_cnt(int sub_dev);
FORWARD int free_buf(u32_t *val, int *len, int sub_dev);
FORWARD int get_samples_in_buf(u32_t *val, int *len, int sub_dev);
FORWARD int get_set_volume(struct volume_level *level, int *len, int
sub_dev, int flag);
FORWARD int reset(int sub_dev);
DEV_STRUCT dev;

12
drivers/audio/es1370/pci_helper.h
View File

@@ -1,12 +1,12 @@
#ifndef PCI_HELPER
#define PCI_HELPER
_PROTOTYPE( unsigned pci_inb, (u16_t port) );
_PROTOTYPE( unsigned pci_inw, (u16_t port) );
_PROTOTYPE( unsigned pci_inl, (u16_t port) );
unsigned pci_inb(u16_t port);
unsigned pci_inw(u16_t port);
unsigned pci_inl(u16_t port);
_PROTOTYPE( void pci_outb, (u16_t port, u8_t value) );
_PROTOTYPE( void pci_outw, (u16_t port, u16_t value) );
_PROTOTYPE( void pci_outl, (u16_t port, u32_t value) );
void pci_outb(u16_t port, u8_t value);
void pci_outw(u16_t port, u16_t value);
void pci_outl(u16_t port, u32_t value);
#endif

18
drivers/audio/es1371/AC97.c
View File

@@ -6,15 +6,15 @@
/* AC97 Mixer and Mode control function prototypes */
FORWARD _PROTOTYPE( int AC97_write,
(const DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) );
FORWARD _PROTOTYPE( int AC97_write_unsynced,
(const DEV_STRUCT * pCC, u16_t wAddr, u16_t wData) );
FORWARD _PROTOTYPE( int AC97_read_unsynced,
(const DEV_STRUCT * pCC, u16_t wAddr, u16_t *data) );
FORWARD _PROTOTYPE( void set_nice_volume, (void) );
FORWARD _PROTOTYPE( int AC97_get_volume, (struct volume_level *level) );
FORWARD _PROTOTYPE( int AC97_set_volume, (const struct volume_level *level) );
FORWARD int AC97_write(const DEV_STRUCT * pCC, u16_t wAddr, u16_t
wData);
FORWARD int AC97_write_unsynced(const DEV_STRUCT * pCC, u16_t wAddr,
u16_t wData);
FORWARD int AC97_read_unsynced(const DEV_STRUCT * pCC, u16_t wAddr,
u16_t *data);
FORWARD void set_nice_volume(void);
FORWARD int AC97_get_volume(struct volume_level *level);
FORWARD int AC97_set_volume(const struct volume_level *level);

8
drivers/audio/es1371/SRC.h
View File

@@ -4,10 +4,10 @@
#include "es1371.h"
#include "wait.h"
_PROTOTYPE( int SRCInit, (DEV_STRUCT * DSP) );
_PROTOTYPE( int SRCRegRead, (DEV_STRUCT * DSP, u16_t reg, u16_t *data) );
_PROTOTYPE( int SRCRegWrite, (DEV_STRUCT * DSP, u16_t reg, u16_t val) );
_PROTOTYPE( void SRCSetRate, (DEV_STRUCT * DSP, char src_base, u16_t rate) );
int SRCInit(DEV_STRUCT * DSP);
int SRCRegRead(DEV_STRUCT * DSP, u16_t reg, u16_t *data);
int SRCRegWrite(DEV_STRUCT * DSP, u16_t reg, u16_t val);
void SRCSetRate(DEV_STRUCT * DSP, char src_base, u16_t rate);
/* register/base and control equates for the SRC RAM */

30
drivers/audio/es1371/es1371.c
View File

@@ -34,22 +34,20 @@
/* prototypes of private functions */
FORWARD _PROTOTYPE( int detect_hw, (void) );
FORWARD _PROTOTYPE( int disable_int, (int sub_dev) );
FORWARD _PROTOTYPE( int set_stereo, (u32_t stereo, int sub_dev) );
FORWARD _PROTOTYPE( int set_bits, (u32_t nr_of_bits, int sub_dev) );
FORWARD _PROTOTYPE( int set_sample_rate, (u32_t rate, int sub_dev) );
FORWARD _PROTOTYPE( int set_sign, (u32_t val, int sub_dev) );
FORWARD _PROTOTYPE( int get_max_frag_size,
(u32_t * val, int *len, int sub_dev) );
FORWARD _PROTOTYPE( int set_frag_size, (u32_t fragment_size, int sub_dev) );
FORWARD _PROTOTYPE( int set_int_cnt, (int sub_dev) );
FORWARD _PROTOTYPE( int free_buf, (u32_t *val, int *len, int sub_dev) );
FORWARD _PROTOTYPE( int get_samples_in_buf,
(u32_t *val, int *len, int sub_dev) );
FORWARD _PROTOTYPE( int get_set_volume, (struct volume_level *level, int *len,
int sub_dev, int flag) );
FORWARD _PROTOTYPE( int reset, (int sub_dev) );
FORWARD int detect_hw(void);
FORWARD int disable_int(int sub_dev);
FORWARD int set_stereo(u32_t stereo, int sub_dev);
FORWARD int set_bits(u32_t nr_of_bits, int sub_dev);
FORWARD int set_sample_rate(u32_t rate, int sub_dev);
FORWARD int set_sign(u32_t val, int sub_dev);
FORWARD int get_max_frag_size(u32_t * val, int *len, int sub_dev);
FORWARD int set_frag_size(u32_t fragment_size, int sub_dev);
FORWARD int set_int_cnt(int sub_dev);
FORWARD int free_buf(u32_t *val, int *len, int sub_dev);
FORWARD int get_samples_in_buf(u32_t *val, int *len, int sub_dev);
FORWARD int get_set_volume(struct volume_level *level, int *len, int
sub_dev, int flag);
FORWARD int reset(int sub_dev);
DEV_STRUCT dev;

12
drivers/audio/es1371/pci_helper.h
View File

@@ -1,12 +1,12 @@
#ifndef PCI_HELPER
#define PCI_HELPER
_PROTOTYPE( unsigned pci_inb, (u16_t port) );
_PROTOTYPE( unsigned pci_inw, (u16_t port) );
_PROTOTYPE( unsigned pci_inl, (u16_t port) );
unsigned pci_inb(u16_t port);
unsigned pci_inw(u16_t port);
unsigned pci_inl(u16_t port);
_PROTOTYPE( void pci_outb, (u16_t port, u8_t value) );
_PROTOTYPE( void pci_outw, (u16_t port, u16_t value) );
_PROTOTYPE( void pci_outl, (u16_t port, u32_t value) );
void pci_outb(u16_t port, u8_t value);
void pci_outw(u16_t port, u16_t value);
void pci_outl(u16_t port, u32_t value);
#endif

7
drivers/audio/es1371/sample_rate_converter.c
View File

@@ -34,10 +34,9 @@
FORWARD _PROTOTYPE( int src_reg_read, (const DEV_STRUCT * DSP,
u16_t reg, u16_t *data) );
FORWARD _PROTOTYPE( int src_reg_write, (const DEV_STRUCT * DSP,
u16_t reg, u16_t val) );
FORWARD int src_reg_read(const DEV_STRUCT * DSP, u16_t reg, u16_t
*data);
FORWARD int src_reg_write(const DEV_STRUCT * DSP, u16_t reg, u16_t val);
int src_init ( DEV_STRUCT * DSP ) {

4
drivers/audio/es1371/sample_rate_converter.h
View File

@@ -5,8 +5,8 @@
#include "wait.h"
#include "pci_helper.h"
_PROTOTYPE( int src_init, (DEV_STRUCT * DSP) );
_PROTOTYPE( void src_set_rate, (const DEV_STRUCT * DSP, char src_base, u16_t rate) );
int src_init(DEV_STRUCT * DSP);
void src_set_rate(const DEV_STRUCT * DSP, char src_base, u16_t rate);
#define SRC_SYNTH_BASE 0x70
#define SRC_DAC_BASE 0x74

7
drivers/audio/sb16/mixer.c
View File

@@ -3,9 +3,10 @@
FORWARD _PROTOTYPE( int get_set_volume, (struct volume_level *level, int flag));
FORWARD _PROTOTYPE( int get_set_input, (struct inout_ctrl *input, int flag, int channel));
FORWARD _PROTOTYPE( int get_set_output, (struct inout_ctrl *output, int flag));
FORWARD int get_set_volume(struct volume_level *level, int flag);
FORWARD int get_set_input(struct inout_ctrl *input, int flag, int
channel);
FORWARD int get_set_output(struct inout_ctrl *output, int flag);

8
drivers/audio/sb16/mixer.h
View File

@@ -1,10 +1,10 @@
#ifndef SB16_MIXER_H
#define SB16_MIXER_H
_PROTOTYPE( int mixer_init, (void));
_PROTOTYPE( int mixer_ioctl, (int request, void *val, int *len));
int mixer_init(void);
int mixer_ioctl(int request, void *val, int *len);
_PROTOTYPE( int mixer_set, (int reg, int data));
_PROTOTYPE( int mixer_get, (int reg));
int mixer_set(int reg, int data);
int mixer_get(int reg);
#endif

16
drivers/audio/sb16/sb16.c
View File

@@ -11,15 +11,15 @@
#include "mixer.h"
FORWARD _PROTOTYPE( void dsp_dma_setup, (phys_bytes address, int count, int sub_dev) );
FORWARD void dsp_dma_setup(phys_bytes address, int count, int sub_dev);
FORWARD _PROTOTYPE( int dsp_ioctl, (int request, void *val, int *len));
FORWARD _PROTOTYPE( int dsp_set_size, (unsigned int size) );
FORWARD _PROTOTYPE( int dsp_set_speed, (unsigned int speed) );
FORWARD _PROTOTYPE( int dsp_set_stereo, (unsigned int stereo) );
FORWARD _PROTOTYPE( int dsp_set_bits, (unsigned int bits) );
FORWARD _PROTOTYPE( int dsp_set_sign, (unsigned int sign) );
FORWARD _PROTOTYPE( int dsp_get_max_frag_size, (u32_t *val, int *len) );
FORWARD int dsp_ioctl(int request, void *val, int *len);
FORWARD int dsp_set_size(unsigned int size);
FORWARD int dsp_set_speed(unsigned int speed);
FORWARD int dsp_set_stereo(unsigned int stereo);
FORWARD int dsp_set_bits(unsigned int bits);
FORWARD int dsp_set_sign(unsigned int sign);
FORWARD int dsp_get_max_frag_size(u32_t *val, int *len);
PRIVATE unsigned int DspStereo = DEFAULT_STEREO;

6
drivers/audio/sb16/sb16.h
View File

@@ -172,8 +172,8 @@
#define dma_bytes_left(phys) \
((unsigned) (sizeof(int) == 2 ? 0 : 0x10000) - (unsigned) ((phys) & 0xFFFF))
_PROTOTYPE( int dsp_command, (int value) );
_PROTOTYPE( int sb16_inb, (int port) );
_PROTOTYPE( void sb16_outb, (int port, int value) );
int dsp_command(int value);
int sb16_inb(int port);
void sb16_outb(int port, int value);
#endif /* SB16_H */