summaryrefslogtreecommitdiff
path: root/camlibs/sierra
diff options
context:
space:
mode:
authorSijawusz Pur Rahnama <sija@sija.pl>2020-05-25 17:49:22 +0200
committerSijawusz Pur Rahnama <sija@sija.pl>2020-05-25 17:55:09 +0200
commitfd0be84db57825472483432390fc4b87d29b4fbe (patch)
tree24b6a09976a57c208369ab75246cf75356f8c5bb /camlibs/sierra
parentacafc3324695b6f51ada104af461fdf8905b03cd (diff)
downloadlibgphoto2-fd0be84db57825472483432390fc4b87d29b4fbe.tar.gz
Fix typos throughout the codebase
Diffstat (limited to 'camlibs/sierra')
-rw-r--r--camlibs/sierra/ChangeLog2
-rw-r--r--camlibs/sierra/MC-EU1-Protocol.txt4
-rw-r--r--camlibs/sierra/library.c12
-rw-r--r--camlibs/sierra/nikon-desc.c2
-rw-r--r--camlibs/sierra/olympus-desc.c4
-rw-r--r--camlibs/sierra/sierra-desc.c2
-rw-r--r--camlibs/sierra/sierra-desc.h2
-rw-r--r--camlibs/sierra/sierra-usbwrap.c2
8 files changed, 15 insertions, 15 deletions
diff --git a/camlibs/sierra/ChangeLog b/camlibs/sierra/ChangeLog
index ceccc114c..8caa2129d 100644
--- a/camlibs/sierra/ChangeLog
+++ b/camlibs/sierra/ChangeLog
@@ -529,7 +529,7 @@
* sierra.c (camera_start, camera_init): Send the
initialization sequence only on init. Olympus C-860L
stops communications when receiving an initialization
- sequence after some communications have already occured.
+ sequence after some communications have already occurred.
* library.h, library.c (sierra_ping -> sierra_init):
This function isn't really a "ping", since it can be used
diff --git a/camlibs/sierra/MC-EU1-Protocol.txt b/camlibs/sierra/MC-EU1-Protocol.txt
index fadf714a1..2a94751fb 100644
--- a/camlibs/sierra/MC-EU1-Protocol.txt
+++ b/camlibs/sierra/MC-EU1-Protocol.txt
@@ -10,7 +10,7 @@ Speed is set to 19200 bauds
This protocol use 1 or 4 bytes "packets". 4 bytes packets are used to send command to the coolpix and receive information from it.
1 byte packet are used as acknowledge (0x86), not acknowledge (0x15), "attention packet" (0xFF).
Each byte in these packet is divided in two part, bit 0-6 is the value on 7 bits and bit 7 is the odd parity bit (thanks Mark Roberts !)
-Returned value by the coolpix (in the two or three? last byte) have 0x1C offset, and least signifiant byte is sent first, for example
+Returned value by the coolpix (in the two or three? last byte) have 0x1C offset, and least significant byte is sent first, for example
the number of picture is :
nb picture = ((byte[2] & 0x7F) - 0x1C) + 100 * ((byte[3] & 0x7F) - 0x1C)
@@ -72,7 +72,7 @@ Send Receive Informations
0x86
0x9B, 0x01, 0x7F, 0x7F Release the shutter button,
- usefull in bulb mode
+ useful in bulb mode
0x8F
diff --git a/camlibs/sierra/library.c b/camlibs/sierra/library.c
index 77ad17fa8..e6f0aec22 100644
--- a/camlibs/sierra/library.c
+++ b/camlibs/sierra/library.c
@@ -232,7 +232,7 @@ int sierra_list_folders (Camera *camera, const char *folder, CameraList *list,
/**
* sierra_get_picture_folder:
- * @camera : camera data stucture
+ * @camera : camera data structure
* @folder : folder name (to be freed by the caller)
*
* Return the name of the folder that stores pictures. It is assumed that
@@ -286,7 +286,7 @@ int sierra_get_picture_folder (Camera *camera, char **folder)
/**
* sierra_check_battery_capacity:
- * @camera : camera data stucture
+ * @camera : camera data structure
*
* Check if the battery capacity is high enough.
*
@@ -318,7 +318,7 @@ int sierra_check_battery_capacity (Camera *camera, GPContext *context)
/**
* sierra_get_memory_left:
- * @camera : camera data stucture
+ * @camera : camera data structure
* @memory : memory left
*
* Provide the available memory left
@@ -435,7 +435,7 @@ sierra_write_packet (Camera *camera, char *packet, GPContext *context)
break;
}
- /* Determing packet length */
+ /* Determining packet length */
if ((packet[0] == SIERRA_PACKET_COMMAND) ||
(packet[0] == SIERRA_PACKET_DATA) ||
(packet[0] == SIERRA_PACKET_DATA_END)) {
@@ -492,7 +492,7 @@ sierra_write_nak (Camera *camera, GPContext *context)
/**
* sierra_read_packet:
- * @camera : camera data stucture
+ * @camera : camera data structure
* @packet : to return the read packet
*
* Read a data packet from the camera.
@@ -1409,7 +1409,7 @@ sierra_capture (Camera *camera, CameraCaptureType type,
}
/*
* We need to tell the frontend where the new image can be
- * found. Unfortunatelly, we can only figure out the
+ * found. Unfortunately, we can only figure out the
* filename. Therefore, reset the CameraFilesystem and let
* it search for the filename.
*
diff --git a/camlibs/sierra/nikon-desc.c b/camlibs/sierra/nikon-desc.c
index a456e0176..41c58673f 100644
--- a/camlibs/sierra/nikon-desc.c
+++ b/camlibs/sierra/nikon-desc.c
@@ -342,7 +342,7 @@ static const RegisterDescriptorType cp880_reg_33[] = {
* fix the problem.
*
* The use of next and previous should be part of a separate
- * interface, such that a user can continuosly press next or previous to
+ * interface, such that a user can continuously press next or previous to
* cycle through the images (while the camera is in play mode).
*
* Use command 2 (via sierra_sub_action) with action
diff --git a/camlibs/sierra/olympus-desc.c b/camlibs/sierra/olympus-desc.c
index 16f5787b2..5ee949397 100644
--- a/camlibs/sierra/olympus-desc.c
+++ b/camlibs/sierra/olympus-desc.c
@@ -587,7 +587,7 @@ static const RegisterDescriptorType oly3000z_reg_20[] = {
/*
* Olympus 750uz: Register 20: white balance. The main difference is that
- * we have the flourescent 1 2 and 3:
+ * we have the fluorescent 1 2 and 3:
*/
static const ValueNameType oly750uz_reg_20_val_names[] = {
{ { 0x00 }, N_("Auto") },
@@ -608,7 +608,7 @@ static const RegisterDescriptorType oly750uz_reg_20[] = {
/*
* Olympus SP 500uz: Register 20: white balance. The main difference is that
- * we have the flourescent 1 2 and 3:
+ * we have the fluorescent 1 2 and 3:
*/
static const ValueNameType olysp500uz_reg_20_val_names[] = {
{ { 0x00 }, N_("Auto") },
diff --git a/camlibs/sierra/sierra-desc.c b/camlibs/sierra/sierra-desc.c
index a07a73e9c..cfdf669e8 100644
--- a/camlibs/sierra/sierra-desc.c
+++ b/camlibs/sierra/sierra-desc.c
@@ -319,7 +319,7 @@ camera_cam_desc_set_value (Camera *camera, CameraRegisterType *reg_p,
*
* Currently no need to support any subaction here.
*
- * Similiar to the masking above, if we have a register
+ * Similar to the masking above, if we have a register
* larger than 4 bytes, put the four bytes in the int to
* into the low four bytes of the value we want to set;
* fill the rest with whatever was read from the camera.
diff --git a/camlibs/sierra/sierra-desc.h b/camlibs/sierra/sierra-desc.h
index da234e55a..e9fd0a789 100644
--- a/camlibs/sierra/sierra-desc.h
+++ b/camlibs/sierra/sierra-desc.h
@@ -26,7 +26,7 @@
* The lowest level structs are first, followed by the higher levels.
*
* These structures can't be in one single struct, since they are variable
- * length, and each level has a slightly different set of functionallity.
+ * length, and each level has a slightly different set of functionality.
*
* Generally, we have a CameraRegisterSetType with pointers to
* CameraRegisterType registers; each register in turn has pointers to
diff --git a/camlibs/sierra/sierra-usbwrap.c b/camlibs/sierra/sierra-usbwrap.c
index f23b19d41..8ca4b6bbb 100644
--- a/camlibs/sierra/sierra-usbwrap.c
+++ b/camlibs/sierra/sierra-usbwrap.c
@@ -30,7 +30,7 @@
*
* IMPORTANT: In order to use this mode, the camera must be switched
* _out_ of "USB Mass Storage" mode and into "USB PC control mode".
- * The images will not be accessable as a mass-storage/disk device in
+ * The images will not be accessible as a mass-storage/disk device in
* this mode, but you can control the camera, tell it to take pictures
* and download images using the protocol implemented in sierra.c.
*