summaryrefslogtreecommitdiffstats
path: root/kscd/libwm
diff options
context:
space:
mode:
Diffstat (limited to 'kscd/libwm')
-rw-r--r--kscd/libwm/include/wm_cdtext.h10
-rw-r--r--kscd/libwm/include/wm_struct.h2
-rw-r--r--kscd/libwm/plat_aix.c4
-rw-r--r--kscd/libwm/plat_bsd386.c4
-rw-r--r--kscd/libwm/plat_freebsd.c4
-rw-r--r--kscd/libwm/plat_hpux.c6
-rw-r--r--kscd/libwm/plat_irix.c4
-rw-r--r--kscd/libwm/plat_linux.c6
-rw-r--r--kscd/libwm/plat_news.c4
-rw-r--r--kscd/libwm/plat_openbsd.c4
-rw-r--r--kscd/libwm/plat_osf1.c4
-rw-r--r--kscd/libwm/plat_scor5.c6
-rw-r--r--kscd/libwm/plat_sun.c6
-rw-r--r--kscd/libwm/plat_svr4.c6
-rw-r--r--kscd/libwm/plat_template.c6
-rw-r--r--kscd/libwm/plat_ultrix.c4
-rw-r--r--kscd/libwm/scsi.c6
17 files changed, 43 insertions, 43 deletions
diff --git a/kscd/libwm/include/wm_cdtext.h b/kscd/libwm/include/wm_cdtext.h
index e843ee95..42dc8b16 100644
--- a/kscd/libwm/include/wm_cdtext.h
+++ b/kscd/libwm/include/wm_cdtext.h
@@ -77,10 +77,10 @@ struct cdtext_info {
#ifndef IGNORE_FEATURE_LIST
struct feature_list_header {
- unsigned char lenght_msb;
- unsigned char lenght_1sb;
- unsigned char lenght_2sb;
- unsigned char lenght_lsb;
+ unsigned char length_msb;
+ unsigned char length_1sb;
+ unsigned char length_2sb;
+ unsigned char length_lsb;
unsigned char reserved1;
unsigned char reserved2;
unsigned char profile_msb;
@@ -91,7 +91,7 @@ struct feature_descriptor_cdread {
unsigned char feature_code_msb;
unsigned char feature_code_lsb;
unsigned char settings;
- unsigned char add_lenght;
+ unsigned char add_length;
unsigned char add_settings;
unsigned char reserved1;
unsigned char reserved2;
diff --git a/kscd/libwm/include/wm_struct.h b/kscd/libwm/include/wm_struct.h
index fb73c94f..71afce07 100644
--- a/kscd/libwm/include/wm_struct.h
+++ b/kscd/libwm/include/wm_struct.h
@@ -186,7 +186,7 @@ int gen_stop(struct wm_drive *d);
int gen_play(struct wm_drive *d, int start, int end, int realstart);
int gen_eject(struct wm_drive *d);
int gen_closetray(struct wm_drive *d);
-int gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght);
+int gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length);
int find_drive_struct(const char *vendor, const char *model, const char *rev);
diff --git a/kscd/libwm/plat_aix.c b/kscd/libwm/plat_aix.c
index 58d29b9f..1413cd88 100644
--- a/kscd/libwm/plat_aix.c
+++ b/kscd/libwm/plat_aix.c
@@ -470,11 +470,11 @@ gen_get_volume(struct wm_drive *d,int *left,int *right)
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_bsd386.c b/kscd/libwm/plat_bsd386.c
index b4e5c420..ea768c8c 100644
--- a/kscd/libwm/plat_bsd386.c
+++ b/kscd/libwm/plat_bsd386.c
@@ -497,11 +497,11 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
}
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_freebsd.c b/kscd/libwm/plat_freebsd.c
index 08fc58a2..a905ff5c 100644
--- a/kscd/libwm/plat_freebsd.c
+++ b/kscd/libwm/plat_freebsd.c
@@ -547,11 +547,11 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_hpux.c b/kscd/libwm/plat_hpux.c
index a52d341f..1a12da4e 100644
--- a/kscd/libwm/plat_hpux.c
+++ b/kscd/libwm/plat_hpux.c
@@ -342,14 +342,14 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
/* This needs to be tested ! */
- return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght);
+ return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_irix.c b/kscd/libwm/plat_irix.c
index 2ddce1e8..7ed89113 100644
--- a/kscd/libwm/plat_irix.c
+++ b/kscd/libwm/plat_irix.c
@@ -460,11 +460,11 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_linux.c b/kscd/libwm/plat_linux.c
index 8852ba16..6ca8b578 100644
--- a/kscd/libwm/plat_linux.c
+++ b/kscd/libwm/plat_linux.c
@@ -785,7 +785,7 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*
* Return a buffer with cdtext-stream. buffer will be allocated and filled
*
@@ -795,9 +795,9 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
- return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght);
+ return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */
#endif /* __linux__ */
diff --git a/kscd/libwm/plat_news.c b/kscd/libwm/plat_news.c
index 4b9f2ef7..73d66228 100644
--- a/kscd/libwm/plat_news.c
+++ b/kscd/libwm/plat_news.c
@@ -430,11 +430,11 @@ gen_get_volume( struct wm_drive *d, omt *left, int *right)
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_openbsd.c b/kscd/libwm/plat_openbsd.c
index 77f9a7a5..57862841 100644
--- a/kscd/libwm/plat_openbsd.c
+++ b/kscd/libwm/plat_openbsd.c
@@ -533,11 +533,11 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_osf1.c b/kscd/libwm/plat_osf1.c
index 6bf1ea69..accf1f81 100644
--- a/kscd/libwm/plat_osf1.c
+++ b/kscd/libwm/plat_osf1.c
@@ -661,11 +661,11 @@ gen_get_volume( struct wm_drive *d, int *left, int *right )
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* no SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_scor5.c b/kscd/libwm/plat_scor5.c
index 4c86024f..6d5b48ab 100644
--- a/kscd/libwm/plat_scor5.c
+++ b/kscd/libwm/plat_scor5.c
@@ -407,14 +407,14 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
/* This needs to be tested! */
- return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght);
+ return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/plat_sun.c b/kscd/libwm/plat_sun.c
index 4e61d68f..80ce3567 100644
--- a/kscd/libwm/plat_sun.c
+++ b/kscd/libwm/plat_sun.c
@@ -959,14 +959,14 @@ codec_stop( void ) { return 0; }
#endif /* CODEC } */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
/* This needs to be tested */
- return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght);
+ return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */
#endif /* sun */
diff --git a/kscd/libwm/plat_svr4.c b/kscd/libwm/plat_svr4.c
index dad4e8af..2b9eff27 100644
--- a/kscd/libwm/plat_svr4.c
+++ b/kscd/libwm/plat_svr4.c
@@ -469,14 +469,14 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
/* This needs to be tested */
- return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght);
+ return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */
#endif
diff --git a/kscd/libwm/plat_template.c b/kscd/libwm/plat_template.c
index da58841a..91d5e736 100644
--- a/kscd/libwm/plat_template.c
+++ b/kscd/libwm/plat_template.c
@@ -281,15 +281,15 @@ gen_get_volume(struct wm_drive *d,int *left,int *right)
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*
* For systems without working wm_scsi(), this should return -1
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
- return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_lenght);
+ return wm_scsi_get_cdtext(d, pp_buffer, p_buffer_length);
} /* gen_get_cdtext() */
#endif /* TEMPLATESYSTEM */
diff --git a/kscd/libwm/plat_ultrix.c b/kscd/libwm/plat_ultrix.c
index 41745116..010055d0 100644
--- a/kscd/libwm/plat_ultrix.c
+++ b/kscd/libwm/plat_ultrix.c
@@ -650,11 +650,11 @@ gen_get_volume(struct wm_drive *d, int *left, int *right)
} /* gen_get_volume() */
/*------------------------------------------------------------------------*
- * gen_get_cdtext(drive, buffer, lenght)
+ * gen_get_cdtext(drive, buffer, length)
*------------------------------------------------------------------------*/
int
-gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_lenght)
+gen_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_length)
{
return -1; /* No SCSI, no CDTEXT */
} /* gen_get_cdtext() */
diff --git a/kscd/libwm/scsi.c b/kscd/libwm/scsi.c
index c3c1d342..3ab2772d 100644
--- a/kscd/libwm/scsi.c
+++ b/kscd/libwm/scsi.c
@@ -527,7 +527,7 @@ wm_scsi2_set_volume(struct wm_drive *d, int left, int right)
}
/*------------------------------------------------------------------------*
- * wm_scsi_get_cdtext(drive, buffer, lenght)
+ * wm_scsi_get_cdtext(drive, buffer, length)
*
* Return a buffer with cdtext-stream. buffer mus be allocated and filled
*
@@ -587,11 +587,11 @@ wm_scsi_get_cdtext(struct wm_drive *d, unsigned char **pp_buffer, int *p_buffer_
if(!ret)
{
pHeader = (struct feature_list_header*)dynamic_temp;
-/* printf("length = %i, profile = 0x%02X%02X\n", pHeader->lenght_lsb, pHeader->profile_msb, pHeader->profile_lsb);*/
+/* printf("length = %i, profile = 0x%02X%02X\n", pHeader->length_lsb, pHeader->profile_msb, pHeader->profile_lsb);*/
pDescriptor = (struct feature_descriptor_cdread*)(dynamic_temp + sizeof(struct feature_list_header));
/* printf("code = 0x%02X%02X, settings = 0x%02X, add_length = %i, add_settings = 0x%02X \n",
pDescriptor->feature_code_msb, pDescriptor->feature_code_lsb, pDescriptor->settings,
- pDescriptor->add_lenght, pDescriptor->add_settings);*/
+ pDescriptor->add_length, pDescriptor->add_settings);*/
cdtext_possible = pDescriptor->add_settings & 0x01;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 18:55:26 +0000