Skip to content

fix/: change LTOA to LTO10 #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliocelon merged 7 commits into from
Aug 13, 2025
Merged

fix/: change LTOA to LTO10 #529

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e98d5f9
fix/: change LTOA to LTO10
Jun 10, 2025
8007373
fix/: chamge timeout_10_hh to timeout_lto10_hh
Jun 10, 2025
bb3cd60
fix/: changes formant
Jun 12, 2025
dc87048
change LTOA to LTO10 on comment
Jul 8, 2025
65dd538
change timeout_10_hh to timeout_lto10_hh on comment
Jul 8, 2025
595d8c6
change lto10
Jul 8, 2025
dda67f0
change order drive dencity
Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libltfs/tape_ops.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ enum {
TC_DC_LTOM8 = 0x5D,
TC_DC_LTO8 = 0x5E,
TC_DC_LTO9 = 0x60,
TC_DC_LTOA = 0x62,
TC_DC_LTOPA = 0x63,
TC_DC_LTO10 = 0x62,
TC_DC_LTOP10 = 0x63,
};

/* Density codes of TS11x0 */
Expand Down
21 changes: 4 additions & 17 deletions src/tape_drivers/generic/file/filedebug_tc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,32 +1409,19 @@ static inline int _sanitize_tape(struct filedebug_data *state)
ret = -EDEV_MEDIUM_FORMAT_ERROR;
break;
}
} else if (gen == DRIVE_GEN_LTOA) {
} else if (gen == DRIVE_GEN_LTO10) {
switch (state->conf.cart_type) {
case TC_MP_LTOPAD_CART:
case TC_MP_LTOAD_CART:
case TC_MP_LTOP10D_CART:
case TC_MP_LTO10D_CART:
/* Do nothing */
break;
default:
ltfsmsg(LTFS_INFO, 30086I, "LTOA", state->conf.cart_type);
ltfsmsg(LTFS_INFO, 30086I, "LTO10", state->conf.cart_type);
state->unsupported_tape = true;
ret = -EDEV_MEDIUM_FORMAT_ERROR;
break;
}
}
else if (gen == DRIVE_GEN_JAG4) {
switch (state->conf.cart_type) {
case TC_MP_LTOPAD_CART:
case TC_MP_LTOAD_CART:
/* Do nothing */
break;
default:
ltfsmsg(LTFS_INFO, 30086I, "LTOA", state->conf.cart_type);
state->unsupported_tape = true;
ret = -EDEV_MEDIUM_FORMAT_ERROR;
break;
}
}
else if (gen == DRIVE_GEN_JAG4) {
switch (state->conf.cart_type) {
case TC_MP_JB:
Expand Down
14 changes: 7 additions & 7 deletions src/tape_drivers/hp_tape.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ struct _timeout_tape{
int timeout; /**< SCSI timeout */
};

/* Base timeout value for LTO */
/* Base timeout value for LTO */
Copy link
Member

@piste-jp piste-jp Jul 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove a space char. It looks inserted accidentally.

static struct _timeout_tape timeout_lto[] = {
{ CHANGE_DEFINITION, -1 },
{ XCOPY, -1 },
Expand Down Expand Up @@ -226,7 +226,7 @@ static struct _timeout_tape timeout_lto9[] = {
{-1, -1}
};

static struct _timeout_tape timeout_ltoA[] = {
static struct _timeout_tape timeout_lto10[] = {
{ ERASE, 16320 },
{ FORMAT_MEDIUM, 3180 },
{ LOAD_UNLOAD, 780 },
Expand Down Expand Up @@ -346,7 +346,7 @@ static struct _timeout_tape timeout_lto9_hh[] = {
{-1, -1}
};

static struct _timeout_tape timeout_ltoA_hh[] = {
static struct _timeout_tape timeout_lto10_hh[] = {
{ ERASE, 166370 },
{ FORMAT_MEDIUM, 3240 },
{ LOAD_UNLOAD, 960 },
Expand Down Expand Up @@ -442,11 +442,11 @@ int hp_tape_init_timeout(struct timeout_tape** table, int type)
case DRIVE_LTO9_HH:
ret = _create_table_tape(table, timeout_lto, timeout_lto9_hh);
break;
case DRIVE_LTOA:
ret = _create_table_tape(table, timeout_lto, timeout_ltoA);
case DRIVE_LTO10:
ret = _create_table_tape(table, timeout_lto, timeout_lto10);
break;
case DRIVE_LTOA_HH:
ret = _create_table_tape(table, timeout_lto, timeout_ltoA_hh);
case DRIVE_LTO10_HH:
ret = _create_table_tape(table, timeout_lto, timeout_lto10_hh);
break;
default:
ret = _create_table_tape(table, timeout_lto, timeout_lto7_hh);
Expand Down
62 changes: 31 additions & 31 deletions src/tape_drivers/ibm_tape.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@ DRIVE_DENSITY_SUPPORT_MAP jaguar_drive_density_strict[] = {
};

DRIVE_DENSITY_SUPPORT_MAP lto_drive_density[] = {
/* LTOA */
{ DRIVE_GEN_LTOA, TC_MP_LTOPAD_CART, TC_DC_LTOPA, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTOA, TC_MP_LTOAD_CART, TC_DC_LTOA, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTOA, TC_MP_LTOAD_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTOA, TC_MP_LTOPAD_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
/* LTO10 */
{ DRIVE_GEN_LTO10, TC_MP_LTOP10D_CART, TC_DC_LTOP10, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTO10, TC_MP_LTO10D_CART, TC_DC_LTO10, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTO10, TC_MP_LTO10D_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTO10, TC_MP_LTOP10D_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
/* LTO9 */
{ DRIVE_GEN_LTO9, TC_MP_LTO9D_CART, TC_DC_LTO9, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTO9, TC_MP_LTO9D_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
Expand Down Expand Up @@ -231,11 +231,11 @@ DRIVE_DENSITY_SUPPORT_MAP lto_drive_density[] = {
};

DRIVE_DENSITY_SUPPORT_MAP lto_drive_density_strict[] = {
/* LTOA */
{ DRIVE_GEN_LTOA, TC_MP_LTOPAD_CART, TC_DC_LTOPA, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTOA, TC_MP_LTOAD_CART, TC_DC_LTOA, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTOA, TC_MP_LTOAD_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTOA, TC_MP_LTOPAD_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
/* LTO10 */
{ DRIVE_GEN_LTO10, TC_MP_LTOP10D_CART, TC_DC_LTOP10, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTO10, TC_MP_LTO10D_CART, TC_DC_LTO10, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTO10, TC_MP_LTO10D_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},
{ DRIVE_GEN_LTO10, TC_MP_LTOP10D_CART, TC_DC_UNKNOWN, MEDIUM_PERFECT_MATCH},

/* LTO9 */
{ DRIVE_GEN_LTO9, TC_MP_LTO9D_CART, TC_DC_LTO9, MEDIUM_PERFECT_MATCH},
Expand All @@ -260,8 +260,8 @@ DRIVE_DENSITY_SUPPORT_MAP lto_drive_density_strict[] = {
};

const unsigned char supported_cart[] = {
TC_MP_LTOPAD_CART,
TC_MP_LTOAD_CART,
TC_MP_LTOP10D_CART,
TC_MP_LTO10D_CART,
TC_MP_LTO9D_CART,
TC_MP_LTO8D_CART,
TC_MP_LTO7D_CART,
Expand Down Expand Up @@ -291,8 +291,8 @@ const unsigned char supported_density[] = {
TC_DC_JAG5A,
TC_DC_JAG5,
TC_DC_JAG4,
TC_DC_LTOPA,
TC_DC_LTOA,
TC_DC_LTOP10,
TC_DC_LTO10,
TC_DC_LTO9,
TC_DC_LTO8,
TC_DC_LTOM8,
Expand Down Expand Up @@ -334,10 +334,10 @@ struct supported_device *ibm_supported_drives[] = {
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-HH9", DRIVE_LTO9_HH, "[ULTRIUM-HH9]" ), /* IBM Ultrium Gen 9 Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-HH9", DRIVE_LTO9_HH, "[ULT3580-HH9]" ), /* IBM Ultrium Gen 9 Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "HH LTO Gen 9", DRIVE_LTO9_HH, "[HH LTO Gen 9]" ), /* IBM Ultrium Gen 9 Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-TDA", DRIVE_LTOA, "[ULTRIUM-TDA]" ), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-TDA", DRIVE_LTOA, "[ULT3580-TDA]"), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-HHA", DRIVE_LTOA_HH, "[ULTRIUM-HHA]"), /* IBM Ultrium Gen A Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-HHA", DRIVE_LTOA_HH, "[ULT3580-HHA]"), /* IBM Ultrium Gen A Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-TDA", DRIVE_LTO10, "[ULTRIUM-TDA]" ), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-TDA", DRIVE_LTO10, "[ULT3580-TDA]"), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-HHA", DRIVE_LTO10_HH,"[ULTRIUM-HHA]"), /* IBM Ultrium Gen A Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-HHA", DRIVE_LTO10_HH,"[ULT3580-HHA]"), /* IBM Ultrium Gen A Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "03592E07", DRIVE_TS1140, "[03592E07]" ), /* IBM TS1140 */
TAPEDRIVE( IBM_VENDOR_ID, "03592E08", DRIVE_TS1150, "[03592E08]" ), /* IBM TS1150 */
TAPEDRIVE( IBM_VENDOR_ID, "0359255F", DRIVE_TS1155, "[0359255F]" ), /* IBM TS1155 */
Expand Down Expand Up @@ -367,9 +367,9 @@ struct supported_device *usb_supported_drives[] = {
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-TD9", DRIVE_LTO9, "[ULT3580-TD9]" ), /* IBM Ultrium Gen 9 */
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-HH9", DRIVE_LTO9_HH, "[ULTRIUM-HH9]" ), /* IBM Ultrium Gen 9 Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-HH9", DRIVE_LTO9_HH, "[ULT3580-HH9]" ), /* IBM Ultrium Gen 9 Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-TDA", DRIVE_LTOA, "[ULT3580-TDA]"), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-HHA", DRIVE_LTOA_HH, "[ULTRIUM-HHA]" ), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-HHA", DRIVE_LTOA_HH, "[ULT3580-HHA]" ), /* IBM Ultrium Gen A Half-High */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-TDA", DRIVE_LTO10, "[ULT3580-TDA]"), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULTRIUM-HHA", DRIVE_LTO10_HH,"[ULTRIUM-HHA]" ), /* IBM Ultrium Gen A */
TAPEDRIVE( IBM_VENDOR_ID, "ULT3580-HHA", DRIVE_LTO10_HH,"[ULT3580-HHA]" ), /* IBM Ultrium Gen A Half-High */
/* End of supported_devices */
NULL
};
Expand Down Expand Up @@ -611,7 +611,7 @@ static struct _timeout_tape timeout_lto9[] = {
{-1, -1}
};

static struct _timeout_tape timeout_ltoA[] = {
static struct _timeout_tape timeout_lto10[] = {
{ ERASE, 16320 },
{ FORMAT_MEDIUM, 3180 },
{ LOAD_UNLOAD, 780 },
Expand Down Expand Up @@ -731,7 +731,7 @@ static struct _timeout_tape timeout_lto9_hh[] = {
{-1, -1}
};

static struct _timeout_tape timeout_ltoA_hh[] = {
static struct _timeout_tape timeout_lto10_hh[] = {
{ ERASE, 166370 },
{ FORMAT_MEDIUM, 3240 },
{ LOAD_UNLOAD, 960 },
Expand Down Expand Up @@ -965,11 +965,11 @@ int ibm_tape_init_timeout(struct timeout_tape** table, int type)
case DRIVE_LTO9_HH:
ret = _create_table_tape(table, timeout_lto, timeout_lto9_hh);
break;
case DRIVE_LTOA:
ret = _create_table_tape(table, timeout_lto, timeout_ltoA);
case DRIVE_LTO10:
ret = _create_table_tape(table, timeout_lto, timeout_lto10);
break;
case DRIVE_LTOA_HH:
ret = _create_table_tape(table, timeout_lto, timeout_ltoA_hh);
case DRIVE_LTO10_HH:
ret = _create_table_tape(table, timeout_lto, timeout_lto10_hh);
break;
case DRIVE_TS1140:
ret = _create_table_tape(table, timeout_11x0, timeout_1140);
Expand Down Expand Up @@ -1058,7 +1058,7 @@ static inline unsigned char _assume_cartridge_type(char product, char btype)
ctype = TC_MP_LTO9D_CART;
break;
case 'A':
ctype = TC_MP_LTOAD_CART;
ctype = TC_MP_LTO10D_CART;
break;
default:
break;
Expand All @@ -1075,7 +1075,7 @@ static inline unsigned char _assume_cartridge_type(char product, char btype)
else if (product == 'P') {
switch (btype) {
case 'A':
ctype = TC_MP_LTOPAD_CART;
ctype = TC_MP_LTOP10D_CART;
break;
default:
break;
Expand Down Expand Up @@ -1119,10 +1119,10 @@ char* ibm_tape_assume_cart_name(unsigned char type)
case TC_MP_LTO9D_CART:
name = "L9";
break;
case TC_MP_LTOAD_CART:
case TC_MP_LTO10D_CART:
name = "LA";
break;
case TC_MP_LTOPAD_CART:
case TC_MP_LTOP10D_CART:
name = "PA";
break;
case TC_MP_JB:
Expand Down
6 changes: 3 additions & 3 deletions src/tape_drivers/quantum_tape.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ static struct _timeout_tape timeout_lto9_hh[] = {
{-1, -1}
};

static struct _timeout_tape timeout_ltoA_hh[] = {
static struct _timeout_tape timeout_lto10_hh[] = {
{ ERASE, 166370 },
{ FORMAT_MEDIUM, 3240 },
{ LOAD_UNLOAD, 960 },
Expand Down Expand Up @@ -327,8 +327,8 @@ int quantum_tape_init_timeout(struct timeout_tape** table, int type)
case DRIVE_LTO9_HH:
ret = _create_table_tape(table, timeout_lto, timeout_lto9_hh);
break;
case DRIVE_LTOA_HH:
ret = _create_table_tape(table, timeout_lto, timeout_ltoA_hh);
case DRIVE_LTO10_HH:
ret = _create_table_tape(table, timeout_lto, timeout_lto10_hh);
break;
default:
ret = _create_table_tape(table, timeout_lto, timeout_lto7_hh);
Expand Down
44 changes: 22 additions & 22 deletions src/tape_drivers/tape_drivers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ enum {
DRIVE_LTO8_HH = 0x2208, /* Ultrium Gen 8 Half-High */
DRIVE_LTO9 = 0x2109, /* Ultrium Gen 9 */
DRIVE_LTO9_HH = 0x2209, /* Ultrium Gen 9 Half-High */
DRIVE_LTOA = 0x210A, /* Ultrium Gen A */
DRIVE_LTOA_HH = 0x220A, /* Ultrium Gen A Half-High */
DRIVE_LTO10 = 0x210A, /* Ultrium Gen 10 */
DRIVE_LTO10_HH = 0x220A, /* Ultrium Gen 10 Half-High */
DRIVE_TS1140 = 0x1104, /* TS1140 */
DRIVE_TS1150 = 0x1105, /* TS1150 */
DRIVE_TS1155 = 0x5105, /* TS1155 */
Expand All @@ -209,7 +209,7 @@ enum {
DRIVE_GEN_LTO7 = 0x2007,
DRIVE_GEN_LTO8 = 0x2008,
DRIVE_GEN_LTO9 = 0x2009,
DRIVE_GEN_LTOA = 0x200A,
DRIVE_GEN_LTO10 = 0x200A,
DRIVE_GEN_JAG4 = 0x1004,
DRIVE_GEN_JAG5 = 0x1005,
DRIVE_GEN_JAG5A = 0x5005,
Expand All @@ -219,25 +219,25 @@ enum {

/* LTO cartridge type in mode page header */
enum {
TC_MP_LTO1D_CART = 0x18, /* LTO1 Data cartridge */
TC_MP_LTO2D_CART = 0x28, /* LTO2 Data cartridge */
TC_MP_LTO3D_CART = 0x38, /* LTO3 Data cartridge */
TC_MP_LTO4D_CART = 0x48, /* LTO4 Data cartridge */
TC_MP_LTO5D_CART = 0x58, /* LTO5 Data cartridge */
TC_MP_LTO6D_CART = 0x68, /* LTO6 Data cartridge */
TC_MP_LTO7D_CART = 0x78, /* LTO7 Data cartridge */
TC_MP_LTO8D_CART = 0x88, /* LTO8 Data cartridge */
TC_MP_LTO9D_CART = 0x98, /* LTO9 Data cartridge */
TC_MP_LTOAD_CART = 0xA8, /* LTOA Data cartridge */
TC_MP_LTOPAD_CART = 0xA9, /* LTOPA Data cartridge */
TC_MP_LTO3W_CART = 0x3C, /* LTO3 WORM cartridge */
TC_MP_LTO4W_CART = 0x4C, /* LTO4 WORM cartridge */
TC_MP_LTO5W_CART = 0x5C, /* LTO5 WORM cartridge */
TC_MP_LTO6W_CART = 0x6C, /* LTO6 WORM cartridge */
TC_MP_LTO7W_CART = 0x7C, /* LTO7 WORM cartridge */
TC_MP_LTO8W_CART = 0x8C, /* LTO8 WORM cartridge */
TC_MP_LTO9W_CART = 0x9C, /* LTO9 WORM cartridge */
TC_MP_LTOAW_CART = 0xAC, /* LTOA WORM cartridge */
TC_MP_LTO1D_CART = 0x18, /* LTO1 Data cartridge */
TC_MP_LTO2D_CART = 0x28, /* LTO2 Data cartridge */
TC_MP_LTO3D_CART = 0x38, /* LTO3 Data cartridge */
TC_MP_LTO4D_CART = 0x48, /* LTO4 Data cartridge */
TC_MP_LTO5D_CART = 0x58, /* LTO5 Data cartridge */
TC_MP_LTO6D_CART = 0x68, /* LTO6 Data cartridge */
TC_MP_LTO7D_CART = 0x78, /* LTO7 Data cartridge */
TC_MP_LTO8D_CART = 0x88, /* LTO8 Data cartridge */
TC_MP_LTO9D_CART = 0x98, /* LTO9 Data cartridge */
TC_MP_LTO10D_CART = 0xA8, /* LTO10 Data cartridge */
TC_MP_LTOP10D_CART = 0xA9, /* LTOP10 Data cartridge */
TC_MP_LTO3W_CART = 0x3C, /* LTO3 WORM cartridge */
TC_MP_LTO4W_CART = 0x4C, /* LTO4 WORM cartridge */
TC_MP_LTO5W_CART = 0x5C, /* LTO5 WORM cartridge */
TC_MP_LTO6W_CART = 0x6C, /* LTO6 WORM cartridge */
TC_MP_LTO7W_CART = 0x7C, /* LTO7 WORM cartridge */
TC_MP_LTO8W_CART = 0x8C, /* LTO8 WORM cartridge */
TC_MP_LTO9W_CART = 0x9C, /* LTO9 WORM cartridge */
TC_MP_LTO10W_CART = 0xAC, /* LTO10 WORM cartridge */
};

/* Enterprise cartridge type in mode page header */
Expand Down
8 changes: 4 additions & 4 deletions src/tape_drivers/vendor_compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,11 +353,11 @@ unsigned char assume_cart_type(const unsigned char dc)
case TC_DC_LTO9:
cart = TC_MP_LTO9D_CART;
break;
case TC_DC_LTOA:
cart = TC_MP_LTOAD_CART;
case TC_DC_LTO10:
cart = TC_MP_LTO10D_CART;
break;
case TC_DC_LTOPA:
cart = TC_MP_LTOPAD_CART;
case TC_DC_LTOP10:
cart = TC_MP_LTOP10D_CART;
break;
default:
// Do nothing
Expand Down
Loading