summaryrefslogtreecommitdiffstats
path: root/kscd/libwm
diff options
context:
space:
mode:
Diffstat (limited to 'kscd/libwm')
-rw-r--r--kscd/libwm/audio/audio_sun.c14
-rw-r--r--kscd/libwm/cddaslave.c2
-rw-r--r--kscd/libwm/cdtext.c18
-rw-r--r--kscd/libwm/database.c2
-rw-r--r--kscd/libwm/include/wm_cdtext.h2
-rw-r--r--kscd/libwm/include/wm_scsi.h2
-rw-r--r--kscd/libwm/plat_hpux.c2
-rw-r--r--kscd/libwm/plat_linux.c2
-rw-r--r--kscd/libwm/plat_linux_audio.c14
-rw-r--r--kscd/libwm/plat_news.c4
-rw-r--r--kscd/libwm/plat_sun.c4
-rw-r--r--kscd/libwm/plat_sun_audio.c14
-rw-r--r--kscd/libwm/plat_svr4.c2
-rw-r--r--kscd/libwm/scsi.c44
14 files changed, 63 insertions, 63 deletions
diff --git a/kscd/libwm/audio/audio_sun.c b/kscd/libwm/audio/audio_sun.c
index bee50905..93ce78d2 100644
--- a/kscd/libwm/audio/audio_sun.c
+++ b/kscd/libwm/audio/audio_sun.c
@@ -54,13 +54,13 @@
* a marker into the audio stream; when the audio device driver encounters the
* marker, it increments a field in a status structure. When we see that
* field go up, we grab the next status structure from the queue and send it
- * to the parent process.
+ * to the tqparent process.
*
* The minimum size of the queue depends on the latency of the audio stream.
*/
-#define QSIZE 500
+#define TQSIZE 500
-struct cdda_block queue[QSIZE];
+struct cdda_block queue[TQSIZE];
int qtail;
int qstart;
@@ -199,7 +199,7 @@ sun_audio_ready( void )
* Start at the correct queue position.
*/
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO");
- qtail = info.play.eof % QSIZE;
+ qtail = info.play.eof % TQSIZE;
qstart = qtail;
queue[qtail].status = WM_CDM_PLAYING;
@@ -284,11 +284,11 @@ sun_audio_send_status( void )
int qhead;
/*
- * Now send the most current status information to our parent.
+ * Now send the most current status information to our tqparent.
*/
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
perror("AUDIO_GETINFO");
- qhead = info.play.eof % QSIZE;
+ qhead = info.play.eof % TQSIZE;
if (qhead != qstart && playing)
{
@@ -367,7 +367,7 @@ sun_audio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk)
perror("audio mark");
}
else
- qtail = (qtail + 1) % QSIZE;
+ qtail = (qtail + 1) % TQSIZE;
fcntl(aufd, F_SETFL, 0);
diff --git a/kscd/libwm/cddaslave.c b/kscd/libwm/cddaslave.c
index b378f95d..dac475e8 100644
--- a/kscd/libwm/cddaslave.c
+++ b/kscd/libwm/cddaslave.c
@@ -169,7 +169,7 @@ receive_command(struct cdda_device *dev, struct cdda_block* blk)
if (read(0, inbuf, 1) <= 0) {
wmcdda_close(dev);
oops->wmaudio_close();
-/* ERRORLOG("cddaslave: parent died, exit\n");*/
+/* ERRORLOG("cddaslave: tqparent died, exit\n");*/
exit(0);
}
diff --git a/kscd/libwm/cdtext.c b/kscd/libwm/cdtext.c
index bb4e19b8..fafd039f 100644
--- a/kscd/libwm/cdtext.c
+++ b/kscd/libwm/cdtext.c
@@ -21,8 +21,8 @@
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#ifdef libunicode
- #include <unicode.h>
+#ifdef libtqunicode
+ #include <tqunicode.h>
#endif
#include "include/wm_config.h"
@@ -155,12 +155,12 @@ void get_data_from_cdtext_pack(
int arr = pack->header_field_id2_tracknumber;
int i;
int language_block;
- int unicode;
+ int tqunicode;
language_block = (pack->header_field_id4_block_no >> 4) & 0x07;
- unicode = pack->header_field_id4_block_no & 0x80;
+ tqunicode = pack->header_field_id4_block_no & 0x80;
- if(!unicode)
+ if(!tqunicode)
{
for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i++)
{
@@ -180,7 +180,7 @@ void get_data_from_cdtext_pack(
}
}
}
-#ifdef libunicode
+#ifdef libtqunicode
else /* doublebytes ;-) */
{
for(i = 0; i < DATAFIELD_LENGHT_IN_PACK; i += 2)
@@ -203,7 +203,7 @@ void get_data_from_cdtext_pack(
}
#else
else {
- wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle unicode");
+ wm_lib_message(WM_MSG_LEVEL_ERROR | WM_MSG_CLASS, "can't handle tqunicode");
}
#endif
}
@@ -315,9 +315,9 @@ get_glob_cdtext(struct wm_drive *d, int redo)
{
wm_cdtext_info.blocks[j] = lp_block;
wm_cdtext_info.blocks[j]->block_code = code;
- wm_cdtext_info.blocks[j]->block_unicode = pack->header_field_id4_block_no & 0x80;
+ wm_cdtext_info.blocks[j]->block_tqunicode = pack->header_field_id4_block_no & 0x80;
wm_lib_message(WM_MSG_LEVEL_DEBUG | WM_MSG_CLASS,
- "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_unicode?"doublebyte":"singlebyte");
+ "CDTEXT INFO: created a new language block; code %i, %s characters\n", code, lp_block->block_tqunicode?"doublebyte":"singlebyte");
/*
unsigned char block_encoding; not jet!
cdtext_string* block_encoding_text;
diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c
index 62d66a32..617905eb 100644
--- a/kscd/libwm/database.c
+++ b/kscd/libwm/database.c
@@ -192,7 +192,7 @@ nomem:
#ifndef NDEBUG
fprintf(stderr,
"WorkMan was run without a home directory, probably by a system daemon.\n");
- fprintf(stderr, "It doesn't know where to find ");
+ fprintf(stderr, "It doesn't know where to tqfind ");
if (no_rc)
{
fprintf(stderr, "your personal preferences file ");
diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h
index e843ee95..ba481be0 100644
--- a/kscd/libwm/include/wm_cdtext.h
+++ b/kscd/libwm/include/wm_cdtext.h
@@ -44,7 +44,7 @@ typedef unsigned char cdtext_string[MAX_LENGHT_OF_CDTEXT_STRING];
struct cdtext_info_block {
/* management */
unsigned char block_code;
- unsigned char block_unicode; /* 0 - single chars, 1 - doublebytes */
+ unsigned char block_tqunicode; /* 0 - single chars, 1 - doublebytes */
unsigned char block_encoding; /* orange book -? */
cdtext_string* block_encoding_text;
diff --git a/kscd/libwm/include/wm_scsi.h b/kscd/libwm/include/wm_scsi.h
index f67e8035..5f11ea7e 100644
--- a/kscd/libwm/include/wm_scsi.h
+++ b/kscd/libwm/include/wm_scsi.h
@@ -30,7 +30,7 @@
#include "wm_struct.h"
-#define WM_ERR_SCSI_INQUIRY_FAILED -1
+#define WM_ERR_SCSI_INTQUIRY_FAILED -1
int wm_scsi_mode_sense( struct wm_drive *d, unsigned char page,
unsigned char *buf );
diff --git a/kscd/libwm/plat_hpux.c b/kscd/libwm/plat_hpux.c
index c5a6991f..a52d341f 100644
--- a/kscd/libwm/plat_hpux.c
+++ b/kscd/libwm/plat_hpux.c
@@ -118,7 +118,7 @@ wmcd_open( struct wm_drive *d )
/* Now fill in the relevant parts of the wm_drive structure. */
fd = d->fd;
- /* Default drive is the HP one, which might not respond to INQUIRY */
+ /* Default drive is the HP one, which might not respond to INTQUIRY */
strcpy(&vendor, "TOSHIBA");
strcpy(&model, "XM-3301");
rev[0] = '\0';
diff --git a/kscd/libwm/plat_linux.c b/kscd/libwm/plat_linux.c
index 8852ba16..1d473ce2 100644
--- a/kscd/libwm/plat_linux.c
+++ b/kscd/libwm/plat_linux.c
@@ -43,7 +43,7 @@
#if 0
/* this breaks the build on ia64 and s390 for example.
sys/types.h is already included and should provide __u64.
- please tell where we really need this and let's try to find
+ please tell where we really need this and let's try to tqfind
a working #if case for everyone ... adrian@suse.de */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21) && LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
#undef __GNUC__
diff --git a/kscd/libwm/plat_linux_audio.c b/kscd/libwm/plat_linux_audio.c
index e5608adf..690a36e5 100644
--- a/kscd/libwm/plat_linux_audio.c
+++ b/kscd/libwm/plat_linux_audio.c
@@ -57,13 +57,13 @@ static char plat_linux_audio_id[] = "$Id$";
* a marker into the audio stream; when the audio device driver encounters the
* marker, it increments a field in a status structure. When we see that
* field go up, we grab the next status structure from the queue and send it
- * to the parent process.
+ * to the tqparent process.
*
* The minimum size of the queue depends on the latency of the audio stream.
*/
-#define QSIZE 500
+#define TQSIZE 500
-struct cdda_block queue[QSIZE];
+struct cdda_block queue[TQSIZE];
int qtail;
int qstart;
@@ -200,7 +200,7 @@ wmaudio_ready( void )
* Start at the correct queue position.
*/
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO");
- qtail = info.play.eof % QSIZE;
+ qtail = info.play.eof % TQSIZE;
qstart = qtail;
queue[qtail].status = WMCDDA_OK;
@@ -275,11 +275,11 @@ wmaudio_send_status( void )
int qhead;
/*
- * Now send the most current status information to our parent.
+ * Now send the most current status information to our tqparent.
*/
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
perror("AUDIO_GETINFO");
- qhead = info.play.eof % QSIZE;
+ qhead = info.play.eof % TQSIZE;
if (qhead != qstart && playing)
{
@@ -357,7 +357,7 @@ wmaudio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk)
perror("audio mark");
}
else
- qtail = (qtail + 1) % QSIZE;
+ qtail = (qtail + 1) % TQSIZE;
fcntl(aufd, F_SETFL, 0);
diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c
index 4b9f2ef7..304ebfda 100644
--- a/kscd/libwm/plat_news.c
+++ b/kscd/libwm/plat_news.c
@@ -181,7 +181,7 @@ int
gen_get_drive_status( struct wm_drive *d, int oldmode,
int *mode, int *pos, int *track, int *index)
{
- struct CD_Status sc;
+ struct CD_tqStatus sc;
/* If we can't get status, the CD is ejected, so default to that. */
*mode = WM_CDM_EJECTED;
@@ -199,7 +199,7 @@ gen_get_drive_status( struct wm_drive *d, int oldmode,
}
/* Disc is ejected. Close the device. */
- if (CD_GetStatus(d->fd, &sc))
+ if (CD_GettqStatus(d->fd, &sc))
{
gen_close(d);
return (0);
diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c
index 4e61d68f..8d09efee 100644
--- a/kscd/libwm/plat_sun.c
+++ b/kscd/libwm/plat_sun.c
@@ -111,7 +111,7 @@ sigthawinit( void )
struct sigaction sa;
sa.sa_handler = thawme;
- sigemptyset(&sa.sa_mask);
+ sigemptyset(&sa.sa_tqmask);
sa.sa_flags = 0;
sigaction(SIGTHAW, &sa, NULL);
@@ -400,7 +400,7 @@ gen_get_drive_status( struct wm_drive *d,
* Now install the no-op signal handler.
*/
new_sig.sa_handler = do_nothing;
- memset(&new_sig.sa_mask, 0, sizeof(new_sig.sa_mask));
+ memset(&new_sig.sa_tqmask, 0, sizeof(new_sig.sa_tqmask));
new_sig.sa_flags = 0;
if (sigaction(SIGALRM, &new_sig, &old_sig))
perror("sigaction");
diff --git a/kscd/libwm/plat_sun_audio.c b/kscd/libwm/plat_sun_audio.c
index 6ef62d7b..3c9dfdc1 100644
--- a/kscd/libwm/plat_sun_audio.c
+++ b/kscd/libwm/plat_sun_audio.c
@@ -59,13 +59,13 @@ static char plat_sun_audio_id[] = "$Id$";
* a marker into the audio stream; when the audio device driver encounters the
* marker, it increments a field in a status structure. When we see that
* field go up, we grab the next status structure from the queue and send it
- * to the parent process.
+ * to the tqparent process.
*
* The minimum size of the queue depends on the latency of the audio stream.
*/
-#define QSIZE 500
+#define TQSIZE 500
-struct cdda_block queue[QSIZE];
+struct cdda_block queue[TQSIZE];
int qtail;
int qstart;
@@ -204,7 +204,7 @@ wmaudio_ready( void )
* Start at the correct queue position.
*/
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0) perror("AUDIO_GETINFO");
- qtail = info.play.eof % QSIZE;
+ qtail = info.play.eof % TQSIZE;
qstart = qtail;
queue[qtail].status = WMCDDA_OK;
@@ -279,11 +279,11 @@ wmaudio_send_status( void )
int qhead;
/*
- * Now send the most current status information to our parent.
+ * Now send the most current status information to our tqparent.
*/
if (ioctl(aucfd, AUDIO_GETINFO, &info) < 0)
perror("AUDIO_GETINFO");
- qhead = info.play.eof % QSIZE;
+ qhead = info.play.eof % TQSIZE;
if (qhead != qstart && playing)
{
@@ -361,7 +361,7 @@ wmaudio_play(unsigned char *rawbuf, long buflen, struct cdda_block *blk)
perror("audio mark");
}
else
- qtail = (qtail + 1) % QSIZE;
+ qtail = (qtail + 1) % TQSIZE;
fcntl(aufd, F_SETFL, 0);
diff --git a/kscd/libwm/plat_svr4.c b/kscd/libwm/plat_svr4.c
index 3ccaf4c4..dad4e8af 100644
--- a/kscd/libwm/plat_svr4.c
+++ b/kscd/libwm/plat_svr4.c
@@ -314,7 +314,7 @@ wm_scsi( struct wm_drive *d, unsigned char *xcdb, int cdblen,
sb.SCB.sc_link = (struct sb *) NULL;
sb.SCB.sc_resid = 0;
- scs.ss_op = SS_REQSEN;
+ scs.ss_op = SS_RETQSEN;
scs.ss_lun = 0;
scs.ss_addr1 = 0;
scs.ss_addr = 0;
diff --git a/kscd/libwm/scsi.c b/kscd/libwm/scsi.c
index 11570146..c3c1d342 100644
--- a/kscd/libwm/scsi.c
+++ b/kscd/libwm/scsi.c
@@ -38,7 +38,7 @@
#include "include/wm_cdrom.h"
#include "include/wm_cdtext.h"
-#define SCMD_INQUIRY 0x12
+#define SCMD_INTQUIRY 0x12
#define SCMD_MODE_SELECT 0x15
#define SCMD_MODE_SENSE 0x1a
#define SCMD_START_STOP 0x1b
@@ -48,14 +48,14 @@
#define SCMD_PLAY_AUDIO_MSF 0x47
#define SCMD_PAUSE_RESUME 0x4b
-#define SUBQ_STATUS_INVALID 0x00
-#define SUBQ_STATUS_PLAY 0x11
-#define SUBQ_STATUS_PAUSE 0x12
-#define SUBQ_STATUS_DONE 0x13
-#define SUBQ_STATUS_ERROR 0x14
-#define SUBQ_STATUS_NONE 0x15
-#define SUBQ_STATUS_NO_DISC 0x17 /* Illegal, but Toshiba returns it. */
-#define SUBQ_ILLEGAL 0xff
+#define SUBTQ_STATUS_INVALID 0x00
+#define SUBTQ_STATUS_PLAY 0x11
+#define SUBTQ_STATUS_PAUSE 0x12
+#define SUBTQ_STATUS_DONE 0x13
+#define SUBTQ_STATUS_ERROR 0x14
+#define SUBTQ_STATUS_NONE 0x15
+#define SUBTQ_STATUS_NO_DISC 0x17 /* Illegal, but Toshiba returns it. */
+#define SUBTQ_ILLEGAL 0xff
#define PAGE_AUDIO 0x0e
#define LEADOUT 0xaa
@@ -194,14 +194,14 @@ wm_scsi_mode_select( struct wm_drive *d, unsigned char *buf, unsigned char len )
}
/*
- * Send an INQUIRY command to get the drive type.
+ * Send an INTQUIRY command to get the drive type.
*
* d Drive structure
* vendor Buffer for vendor name (8 bytes + null)
* model Buffer for model name (16 bytes + null)
* rev Buffer for revision level (4 bytes + null)
*
- * The above string lengths apply to the SCSI INQUIRY command. The
+ * The above string lengths apply to the SCSI INTQUIRY command. The
* actual WorkMan drive structure reserves 31 bytes + NULL per entry.
*
* If the model name begins with "CD-ROM" and zero or more spaces, that will
@@ -216,7 +216,7 @@ wm_scsi_get_drive_type( struct wm_drive *d, char *vendor,
memset(buf, 0, 36);
wm_lib_message(WM_MSG_CLASS_SCSI | WM_MSG_LEVEL_INFO, "Sending SCSI inquiry command...\n");
- if (sendscsi(d, buf, 36, 1, SCMD_INQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0))
+ if (sendscsi(d, buf, 36, 1, SCMD_INTQUIRY, 0, 0, 0, 36, 0,0,0,0,0,0,0))
{
sprintf( vendor, WM_STR_GENVENDOR);
sprintf( model, WM_STR_GENMODEL);
@@ -346,20 +346,20 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode,
}
/* If we can't read status, the CD has been ejected. */
- buf[1] = SUBQ_ILLEGAL;
+ buf[1] = SUBTQ_ILLEGAL;
if (sendscsi(d, buf, sizeof(buf), 1, SCMD_READ_SUBCHANNEL, 2, 64, 1,
0, 0, 0, sizeof(buf) / 256, sizeof(buf) % 256, 0,0,0))
return (0);
switch (buf[1]) {
- case SUBQ_STATUS_PLAY:
+ case SUBTQ_STATUS_PLAY:
*mode = WM_CDM_PLAYING;
*track = buf[6];
*ind = buf[7];
*pos = buf[9] * 60 * 75 + buf[10] * 75 + buf[11];
break;
- case SUBQ_STATUS_PAUSE:
+ case SUBTQ_STATUS_PAUSE:
if (oldmode == WM_CDM_PLAYING || oldmode == WM_CDM_PAUSED)
{
*mode = WM_CDM_PAUSED;
@@ -374,13 +374,13 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode,
break;
/*
- * SUBQ_STATUS_DONE is sometimes returned when the CD is idle,
+ * SUBTQ_STATUS_DONE is sometimes returned when the CD is idle,
* even though the spec says it should only be returned when an
* audio play operation finishes.
*/
- case SUBQ_STATUS_DONE:
- case SUBQ_STATUS_NONE:
- case SUBQ_STATUS_INVALID:
+ case SUBTQ_STATUS_DONE:
+ case SUBTQ_STATUS_NONE:
+ case SUBTQ_STATUS_INVALID:
if (oldmode == WM_CDM_PLAYING)
*mode = WM_CDM_TRACK_DONE;
else
@@ -390,16 +390,16 @@ wm_scsi2_get_drive_status(struct wm_drive *d, int oldmode,
/*
* This usually means there's no disc in the drive.
*/
- case SUBQ_STATUS_NO_DISC:
+ case SUBTQ_STATUS_NO_DISC:
break;
/*
* This usually means the user ejected the CD manually.
*/
- case SUBQ_STATUS_ERROR:
+ case SUBTQ_STATUS_ERROR:
break;
- case SUBQ_ILLEGAL: /* call didn't really succeed */
+ case SUBTQ_ILLEGAL: /* call didn't really succeed */
break;
default:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 20:31:48 +0000