Remove whitespace, update email addresses and URLs.

diff --git a/README b/README
index 6132b3834343311c00246a8eef8144e27f462fe8..91e843f60722931c56310888d52da33b9022f7dd 100644 (file)
--- a/README
+++ b/README
@@ -25,8 +25,8 @@ a clean build on something else, drop a line!
 Author:
 
 Scott Gasch
-scott@wannabe.guru.org
-http://www.medsp.com/scott
+scott@gasch.org
+http://wannabe.guru.org/scott
 
 
 Credits:

diff --git a/dc210camera.cpp b/dc210camera.cpp
index 3984238c63079c5b49dd328c3a49d7d14c058597..43b38791dc89e424184ae3de20394ebf8a5bbf88 100644 (file)
--- a/dc210camera.cpp
+++ b/dc210camera.cpp
@@ -2,11 +2,11 @@
 //
 // File:     kodak.cpp
 //
-// Module:   
+// Module:
 //
-// Synopsis: 
+// Synopsis:
 //
-// Copyright (C) 1999-2000 Scott Gasch <s[email protected].org>
+// Copyright (C) 1999-2000 Scott Gasch <scott@gasch.org>
 //
 // Created:  12 Jan 2000
 //
@@ -28,10 +28,10 @@
 //
 // Function:  CKodakDC210
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   void
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -95,10 +95,10 @@ CKodakDC210::CKodakDC210(char *szDevice, int iSpeed)
 //
 // Function:  ~CKodakDC210
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   void
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -130,10 +130,10 @@ CKodakDC210::~CKodakDC210(void)
 //
 // Function:  Initialize
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -191,10 +191,10 @@ bool CKodakDC210::Initialize(void)
 //
 // Function:  SetSpeed
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int iBps
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -204,7 +204,7 @@ bool CKodakDC210::SetSpeed(int iBps)
 {
        BYTE bArg1, bArg2;
 
-       // 
+       //
        // Determine what arguments to send to the camera to communicate
        // the new speed.
        //
@@ -267,7 +267,7 @@ bool CKodakDC210::SetSpeed(int iBps)
 
        //
        // Success
-       // 
+       //
        return(true);
 }
 
@@ -276,10 +276,10 @@ bool CKodakDC210::SetSpeed(int iBps)
 //
 // Function:  TakePicture
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -321,10 +321,10 @@ bool CKodakDC210::TakePicture(void)
 //
 // Function:  RefreshProperties
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   bool - true if command successful
 //
 // History:   sgasch Created Header    8 Jun 1999
@@ -380,10 +380,10 @@ bool CKodakDC210::RefreshProperties(void)
 //
 // Function:  GetRawStatusData
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: BYTE *pData
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -404,11 +404,11 @@ bool CKodakDC210::GetRawStatusData(BYTE *pData)
 //
 // Function:  GetFirmwareVersion
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piMajor,
 //            int *piMinor
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -426,11 +426,11 @@ bool CKodakDC210::GetFirmwareVersion(int *piMajor, int *piMinor)
 //
 // Function:  GetRomVersion
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piMajor,
 //            int *piMinor
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -448,10 +448,10 @@ bool CKodakDC210::GetRomVersion(int *piMajor, int *piMinor)
 //
 // Function:  GetBatteryStatus
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_BATTERY_STATE *pState
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -483,10 +483,10 @@ bool CKodakDC210::GetBatteryStatus(DC210_BATTERY_STATE *pState)
 //
 // Function:  IsAdapterAttached
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfAttached
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -514,10 +514,10 @@ bool CKodakDC210::IsAdapterAttached(bool *pfAttached)
 //
 // Function:  GetZoomState
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_ZOOM_STATE *pZoom
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -562,11 +562,11 @@ bool CKodakDC210::GetZoomState(DC210_ZOOM_STATE *pZoom)
 //
 // Function:  GetResolution
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piWidth,
 //            int *piHeight
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -583,23 +583,23 @@ bool CKodakDC210::GetResolution(int *piWidth, int *piHeight)
        {
                *piWidth = 1152;
                *piHeight = 864;
-       }       
+       }
        else
        {
                ASSERT(false);
-               return(false); 
+               return(false);
        }
-       return(true);  
+       return(true);
 }
 
 //+----------------------------------------------------------------------------
 //
 // Function:  IsFlashCharged
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfCharged
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -610,14 +610,14 @@ bool CKodakDC210::IsFlashCharged(bool *pfCharged)
        if (RefreshProperties())
        {
                if (_bRawStatusData[18])
-               {       
+               {
                        *pfCharged = true;
                }
-               else    
-               {               
+               else
+               {
                        *pfCharged = false;
-               }       
-               return(true);   
+               }
+               return(true);
        }
        return(false);
 }
@@ -627,10 +627,10 @@ bool CKodakDC210::IsFlashCharged(bool *pfCharged)
 //
 // Function:  GetFlashState
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_FLASH_STATE *pState
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -668,10 +668,10 @@ bool CKodakDC210::GetFlashState(DC210_FLASH_STATE *pState)
 //
 // Function:  GetCompressionState
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_COMPRESSION_STATE *pState
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -681,10 +681,10 @@ bool CKodakDC210::GetCompressionState(DC210_COMPRESSION_STATE *pState)
 {
        switch (_bRawStatusData[19])
        {
-           case 0: 
+           case 0:
                        *pState = compression_none;
                        break;
-           case 1: 
+           case 1:
                        *pState = compression_low;
                        break;
            case 2:
@@ -697,8 +697,8 @@ bool CKodakDC210::GetCompressionState(DC210_COMPRESSION_STATE *pState)
                        ASSERT(false);
                        *pState = compression_unknown;
                        return(false);
-       }       
-       return(true);   
+       }
+       return(true);
 }
 
 
@@ -706,10 +706,10 @@ bool CKodakDC210::GetCompressionState(DC210_COMPRESSION_STATE *pState)
 //
 // Function:  GetPictureFormat
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_FILE_FORMAT *eFormat
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -720,7 +720,7 @@ bool CKodakDC210::GetPictureFormat(DC210_FILE_FORMAT *eFormat)
        if (2 == _bRawStatusData[23])
        {
                *eFormat = format_raw;
-       }       
+       }
        else if (3 == _bRawStatusData[23])
        {
                *eFormat = format_jpeg;
@@ -742,10 +742,10 @@ bool CKodakDC210::GetPictureFormat(DC210_FILE_FORMAT *eFormat)
 //
 // Function:  GetClock
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piCameraClock
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -769,10 +769,10 @@ bool CKodakDC210::GetClock(int *piCameraClock)
 //
 // Function:  IsUsingJpeg
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfJPEG
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -806,10 +806,10 @@ bool CKodakDC210::IsUsingJpeg(bool *pfJPEG)
 //
 // Function:  IsUsingFlashPix
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfFlashPix
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -843,10 +843,10 @@ bool CKodakDC210::IsUsingFlashPix(bool *pfFlashPix)
 //
 // Function:  GetLifetimePictureCount
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piPictures
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -863,10 +863,10 @@ bool CKodakDC210::GetLifetimePictureCount(int *piPictures)
 //
 // Function:  GetLifetimeFlashCount
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piFlashes
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -883,10 +883,10 @@ bool CKodakDC210::GetLifetimeFlashCount(int *piFlashes)
 //
 // Function:  IsTimerOn
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfTimer
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -910,10 +910,10 @@ bool CKodakDC210::IsTimerOn(bool *pfTimer)
 //
 // Function:  IsMemoryCardInserted
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfInserted
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -937,10 +937,10 @@ bool CKodakDC210::IsMemoryCardInserted(bool *pfInserted)
 //
 // Function:  IsMemoryCardWriteProtected
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfWriteProt
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -964,10 +964,10 @@ bool CKodakDC210::IsMemoryCardWriteProtected(bool *pfWriteProt)
 //
 // Function:  IsMemoryCardIllegal
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfIllegal
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -991,10 +991,10 @@ bool CKodakDC210::IsMemoryCardIllegal(bool *pfIllegal)
 //
 // Function:  IsMemoryCardFormatted
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfFormatted
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1011,10 +1011,10 @@ bool CKodakDC210::IsMemoryCardFormatted(bool *pfFormatted)
 //
 // Function:  IsMemoryCardOpened
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfOpened
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1031,10 +1031,10 @@ bool CKodakDC210::IsMemoryCardOpened(bool *pfOpened)
 //
 // Function:  GetMemoryCardBitvector
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: BYTE *pbBitv
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1051,10 +1051,10 @@ bool CKodakDC210::GetMemoryCardBitvector(BYTE *pbBitv)
 //
 // Function:  IsUsingNTSC
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfNTSC
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1071,10 +1071,10 @@ bool CKodakDC210::IsUsingNTSC(bool *pfNTSC)
 //
 // Function:  IsUsingPAL
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool *pfPAL
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1091,10 +1091,10 @@ bool CKodakDC210::IsUsingPAL(bool *pfPAL)
 //
 // Function:  GetNumberPictures
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piNum
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1111,10 +1111,10 @@ bool CKodakDC210::GetNumberPictures(int *piNum)
 //
 // Function:  GetRemainingPicturesLowCompression
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piNum
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1131,10 +1131,10 @@ bool CKodakDC210::GetRemainingPicturesLowCompression(int *piNum)
 //
 // Function:  GetRemainingPicturesMedCompression
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piNum
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1151,10 +1151,10 @@ bool CKodakDC210::GetRemainingPicturesMedCompression(int *piNum)
 //
 // Function:  GetRemainingPicturesHighCompression
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piNum
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1171,10 +1171,10 @@ bool CKodakDC210::GetRemainingPicturesHighCompression(int *piNum)
 //
 // Function:  GetMemoryCardVolumeLabel
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: char *szLabel
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1192,10 +1192,10 @@ bool CKodakDC210::GetMemoryCardVolumeLabel(char *szLabel)
 //
 // Function:  GetIdString
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: char *szId
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1213,10 +1213,10 @@ bool CKodakDC210::GetIdString(char *szId)
 //
 // Function:  GetTimeValue
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piClock
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1240,10 +1240,10 @@ bool CKodakDC210::GetTimeValue(int *piClock)
 //
 // Function:  GetTimeString
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: char *pszTime
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1270,10 +1270,10 @@ bool CKodakDC210::GetTimeString(char *pszTime)
 //
 // Function:  GetTimeMinutes
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piMin
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1297,10 +1297,10 @@ bool CKodakDC210::GetTimeMinutes(int *piMin)
 //
 // Function:  GetTimeHours
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piHrs
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1324,10 +1324,10 @@ bool CKodakDC210::GetTimeHours(int *piHrs)
 //
 // Function:  GetTimeSeconds
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piSec
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1351,10 +1351,10 @@ bool CKodakDC210::GetTimeSeconds(int *piSec)
 //
 // Function:  GetTimeMonth
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piMon
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1378,10 +1378,10 @@ bool CKodakDC210::GetTimeMonth(int *piMon)
 //
 // Function:  GetTimeDay
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piDay
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1405,10 +1405,10 @@ bool CKodakDC210::GetTimeDay(int *piDay)
 //
 // Function:  GetTimeYear
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int *piYear
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -1432,10 +1432,10 @@ bool CKodakDC210::GetTimeYear(int *piYear)
 //
 // Function:  SetFlashState
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: bool fState
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    15 Jan 2000
@@ -1463,10 +1463,10 @@ bool CKodakDC210::SetFlashState(bool fState)
 //
 // Function:  SetFlashState
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_FLASH_STATE eState
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    15 Jan 2000
@@ -1645,7 +1645,7 @@ bool CKodakDC210::SetResolution(int iWidth, int iHeight)
 //           (12) Baud rate 9600
 //
 // Arguments: void
-//            
+//
 // Returns:   bool - true if successful
 //
 // History:   sgasch Created Header    8 Jun 1999
@@ -1680,7 +1680,7 @@ bool CKodakDC210::Reset(void)
 
        //
        // Wait for completion.
-       // 
+       //
        if (!CommandComplete())
        {
                Trace("Reset: command complete signal not received.\n");
@@ -1709,10 +1709,10 @@ bool CKodakDC210::Reset(void)
 //
 // Function:  SetCompressionState
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_COMPRESSION_STATE eCompression
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    15 Jan 2000
@@ -1775,10 +1775,10 @@ bool CKodakDC210::SetCompressionState(DC210_COMPRESSION_STATE eCompression)
 //
 // Function:  SetZoomState
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_ZOOM_STATE eZoom
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    15 Jan 2000
@@ -1848,10 +1848,10 @@ bool CKodakDC210::SetZoomState(DC210_ZOOM_STATE eZoom)
 //
 // Function:  ToggleShutterDelay
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: BOOL fEnable
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    15 Jan 2000
@@ -1897,10 +1897,10 @@ bool CKodakDC210::ToggleShutterDelay(BOOL fEnable)
 //
 // Function:  SetPictureFormat
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: DC210_FILE_FORMAT eFormat
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    15 Jan 2000
@@ -1989,7 +1989,7 @@ bool CKodakDC210::SetIdString(char *szId)
 // Synopsis:  Send a command sequence to the camera.
 //
 // Arguments: char bCommand
-//            
+//
 // Returns:   bool - true if command sent okay.
 //
 // History:   sgasch Created Header    4 Jun 1999
@@ -2054,7 +2054,7 @@ bool CKodakDC210::SendCommand(int bCommand, BYTE arg1, BYTE arg2, BYTE arg3,
 // Synopsis:  Read a command byte from the port and see if it's an ACK.
 //
 // Arguments: void
-//            
+//
 // Returns:   bool - true if successful ACK received, false otherwise
 //
 // History:   sgasch Created Header    4 Jun 1999
@@ -2098,7 +2098,7 @@ bool CKodakDC210::GetAck(void)
 //            send BUSY signals so we know it's still there but working.
 //
 // Arguments: void
-//            
+//
 // Returns:   bool - true if successful
 //
 // History:   sgasch Created Header    8 Jun 1999
@@ -2137,11 +2137,11 @@ bool CKodakDC210::CommandComplete(void)
 //
 // Function:  ReadPacket
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: BYTE *buf,
 //            int iPacketSize
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    13 Jan 2000
@@ -2245,12 +2245,12 @@ bool CKodakDC210::ReadPacket(BYTE *buf, int iPacketSize)
                                return(false);
                        }
                }
-       } 
+       }
        //
        // Continue to loop while the packet is bad and we have not yet
        // reached the upper limit to how many attempts to make.
        //
-       while ((bChecksumComputed != bChecksumFromCamera) && 
+       while ((bChecksumComputed != bChecksumFromCamera) &&
                   (++iAttempts < g_iMaxAttempts));
 
        //
@@ -2270,7 +2270,7 @@ bool CKodakDC210::ReadPacket(BYTE *buf, int iPacketSize)
 
        //
        // Success
-       // 
+       //
        return(true);
 }
 
@@ -2285,7 +2285,7 @@ bool CKodakDC210::ReadPacket(BYTE *buf, int iPacketSize)
 // Arguments: BYTE bControl - the control byte
 //            BYTE *buf - the data
 //            int iLength - how large is the packet
-//            
+//
 // Returns:   bool - true on success
 //
 // History:   sgasch Created Header    8 Jun 1999
@@ -2307,8 +2307,8 @@ bool CKodakDC210::SendPacket(BYTE bControl, BYTE *buf, int iLength)
                Trace("SendPacket: Invalid packet length, aborting.\n");
                return(false);
        }
-       if ((bControl != DC210_NORMAL_PACKET) && 
-               (bControl != DC210_FINAL_PACKET) && 
+       if ((bControl != DC210_NORMAL_PACKET) &&
+               (bControl != DC210_FINAL_PACKET) &&
                (bControl != DC210_ABORT_PACKET))
        {
                Trace("SendPacket: Invalid control byte, aborting.\n");
@@ -2371,7 +2371,7 @@ bool CKodakDC210::SendPacket(BYTE bControl, BYTE *buf, int iLength)
        // causing mismatched checksums) or until we reach the limit of packet
        // errors.
        //
-       while ((bConfirm != DC210_CORRECT_PACKET) && 
+       while ((bConfirm != DC210_CORRECT_PACKET) &&
                   (++iAttempts < _iMaxAttempts));
 
        //
@@ -2407,7 +2407,7 @@ bool CKodakDC210::SendPacket(BYTE bControl, BYTE *buf, int iLength)
 // Arguments: BYTE *pbChecksum - checksum computed
 //            BYTE *buf - data ptr
 //            int iSize - data length
-//            
+//
 // Returns:   bool - true if successful
 //
 // History:   sgasch Created Header    8 Jun 1999

diff --git a/dc210photo.cpp b/dc210photo.cpp
index 7fb48c1ef3854ad2869736fe5ed54e90879ab21d..cca111b2d92f7fcd9415a3ee8fae45552db1bd1a 100644 (file)
--- a/dc210photo.cpp
+++ b/dc210photo.cpp
@@ -2,11 +2,11 @@
 //
 // File:     dc210photo.cpp
 //
-// Module:   
+// Module:
 //
-// Synopsis: 
+// Synopsis:
 //
-// Copyright (C) 1999-2000 Scott Gasch <s[email protected].org>
+// Copyright (C) 1999-2000 Scott Gasch <scott@gasch.org>
 //
 // Created:  15 Jan 2000
 //
@@ -30,8 +30,8 @@ CKodakDC210Photo::CKodakDC210Photo(int iPictureNumber, CKodakDC210 *pCamera)
        {
                if (!_pCamera->SendCommand(DC210_PICTURE_INFO,
                                                                   (((iPictureNumber - 1) & 0xFF00) >> 8),
-                                                                  (iPictureNumber - 1) & 0x00FF, 
-                                                                  0, 
+                                                                  (iPictureNumber - 1) & 0x00FF,
+                                                                  0,
                                                                   0))
                {
                        Trace("CKodakDC210Photo: Could not send command to camera.\n");
@@ -332,7 +332,7 @@ bool CKodakDC210Photo::GetData(BYTE **ppData, int *piLength)
        }
 
        buf = (BYTE *) realloc(buf, iSize);
-       if (!buf) 
+       if (!buf)
        {
                Trace("GetData: Out of memory in realloc\n");
                return(false);

diff --git a/dc210photo.h b/dc210photo.h
index 4ae475952350b69cdc667abebb8d8f70646cff4f..8846588e4e509d3006812233690ceebe93a2e6d5 100644 (file)
--- a/dc210photo.h
+++ b/dc210photo.h
@@ -2,11 +2,11 @@
 //
 // File:     dc210photo.h
 //
-// Module:   
+// Module:
 //
-// Synopsis: 
+// Synopsis:
 //
-// Copyright (C) 1999-2000 Scott Gasch <s[email protected].org>
+// Copyright (C) 1999-2000 Scott Gasch <scott@gasch.org>
 //
 // Created:  15 Jan 2000
 //

diff --git a/serial.cpp b/serial.cpp
index 914c6f9d7a92ea749b4d8a42e49dcbcb67abd7d1..beb66c0ab7a28d7c9e4b17e74ca7add3c07357f0 100644 (file)
--- a/serial.cpp
+++ b/serial.cpp
@@ -2,11 +2,11 @@
 //
 // File:     serial.cpp
 //
-// Module:   
+// Module:
 //
-// Synopsis: 
+// Synopsis:
 //
-// Copyright (C) 1999-2000 Scott Gasch <s[email protected].org>
+// Copyright (C) 1999-2000 Scott Gasch <scott@gasch.org>
 //
 // Created:  12 Jan 2000
 //
@@ -31,10 +31,10 @@
 //
 // Function:  CSerialPort
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   void
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -50,10 +50,10 @@ CSerialPort::CSerialPort(void)
 //
 // Function:  CSerialPort
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: char *szDevice
-//            
+//
 // Returns:   void
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -100,10 +100,10 @@ CSerialPort::CSerialPort(char *szDevice)
 //
 // Function:  CSerialPort
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   void
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -126,10 +126,10 @@ CSerialPort::~CSerialPort(void)
 //
 // Function:  SetTimeout
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int iNewTimeout
-//            
+//
 // Returns:   void
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -145,10 +145,10 @@ void CSerialPort::SetTimeout(int iNewTimeout)
 //
 // Function:  GetTimeout
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   int
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -163,11 +163,11 @@ int CSerialPort::GetTimeout(void)
 //
 // Function:  Read
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: BYTE *buf,
 //            int iNumBytes
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -250,11 +250,11 @@ bool CSerialPort::Read(BYTE *buf, int iNumBytes)
 //
 // Function:  Write
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: BYTE *buf,
 //            int iNumBytes
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -333,10 +333,10 @@ bool CSerialPort::Write(BYTE *buf, int iNumBytes)
 //
 // Function:  SetBaudrate
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: int iBps
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -433,10 +433,10 @@ bool CSerialPort::SetBaudrate(int iBps)
 //
 // Function:  GetBaudrate
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: void
-//            
+//
 // Returns:   int
 //
 // History:   sgasch Created Header    12 Jan 2000
@@ -451,10 +451,10 @@ int CSerialPort::GetBaudrate(void)
 //
 // Function:  SetupLine (private)
 //
-// Synopsis:  
+// Synopsis:
 //
 // Arguments: char *szDevice
-//            
+//
 // Returns:   bool
 //
 // History:   sgasch Created Header    12 Jan 2000